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/xfs | |
| 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/xfs')
| -rw-r--r-- | fs/xfs/xfs_export.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c index a83611849cee..c585bc646395 100644 --- a/fs/xfs/xfs_export.c +++ b/fs/xfs/xfs_export.c | |||
| @@ -48,7 +48,7 @@ static int xfs_fileid_length(int fileid_type) | |||
| 48 | case FILEID_INO32_GEN_PARENT | XFS_FILEID_TYPE_64FLAG: | 48 | case FILEID_INO32_GEN_PARENT | XFS_FILEID_TYPE_64FLAG: |
| 49 | return 6; | 49 | return 6; |
| 50 | } | 50 | } |
| 51 | return 255; /* invalid */ | 51 | return FILEID_INVALID; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | STATIC int | 54 | STATIC int |
| @@ -90,7 +90,7 @@ xfs_fs_encode_fh( | |||
| 90 | len = xfs_fileid_length(fileid_type); | 90 | len = xfs_fileid_length(fileid_type); |
| 91 | if (*max_len < len) { | 91 | if (*max_len < len) { |
| 92 | *max_len = len; | 92 | *max_len = len; |
| 93 | return 255; | 93 | return FILEID_INVALID; |
| 94 | } | 94 | } |
| 95 | *max_len = len; | 95 | *max_len = len; |
| 96 | 96 | ||