diff options
author | Namjae Jeon <namjae.jeon@samsung.com> | 2013-02-17 01:48:11 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-26 02:46:10 -0500 |
commit | 94e07a7590ae855bae0536c42b3086fadc7c83a8 (patch) | |
tree | a34b3acd03dc5da51b3307478dd572fbd6d22880 /fs/ocfs2 | |
parent | 182be684784334598eee1d90274e7f7aa0063616 (diff) |
fs: encode_fh: return FILEID_INVALID if invalid fid_type
This patch is a follow up on below patch:
[PATCH] exportfs: add FILEID_INVALID to indicate invalid fid_type
commit: 216b6cbdcbd86b1db0754d58886b466ae31f5a63
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Vivek Trivedi <t.vivek@samsung.com>
Acked-by: Steven Whitehouse <swhiteho@redhat.com>
Acked-by: Sage Weil <sage@inktank.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/export.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index 322216a5f0dd..29651167190d 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c | |||
@@ -195,11 +195,11 @@ static int ocfs2_encode_fh(struct inode *inode, u32 *fh_in, int *max_len, | |||
195 | 195 | ||
196 | if (parent && (len < 6)) { | 196 | if (parent && (len < 6)) { |
197 | *max_len = 6; | 197 | *max_len = 6; |
198 | type = 255; | 198 | type = FILEID_INVALID; |
199 | goto bail; | 199 | goto bail; |
200 | } else if (len < 3) { | 200 | } else if (len < 3) { |
201 | *max_len = 3; | 201 | *max_len = 3; |
202 | type = 255; | 202 | type = FILEID_INVALID; |
203 | goto bail; | 203 | goto bail; |
204 | } | 204 | } |
205 | 205 | ||