aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2
diff options
context:
space:
mode:
authorNamjae Jeon <namjae.jeon@samsung.com>2013-02-17 01:48:11 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-26 02:46:10 -0500
commit94e07a7590ae855bae0536c42b3086fadc7c83a8 (patch)
treea34b3acd03dc5da51b3307478dd572fbd6d22880 /fs/nilfs2
parent182be684784334598eee1d90274e7f7aa0063616 (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/nilfs2')
-rw-r--r--fs/nilfs2/namei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index 1d0c0b84c5a3..9de78f08989e 100644
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -517,11 +517,11 @@ static int nilfs_encode_fh(struct inode *inode, __u32 *fh, int *lenp,
517 517
518 if (parent && *lenp < NILFS_FID_SIZE_CONNECTABLE) { 518 if (parent && *lenp < NILFS_FID_SIZE_CONNECTABLE) {
519 *lenp = NILFS_FID_SIZE_CONNECTABLE; 519 *lenp = NILFS_FID_SIZE_CONNECTABLE;
520 return 255; 520 return FILEID_INVALID;
521 } 521 }
522 if (*lenp < NILFS_FID_SIZE_NON_CONNECTABLE) { 522 if (*lenp < NILFS_FID_SIZE_NON_CONNECTABLE) {
523 *lenp = NILFS_FID_SIZE_NON_CONNECTABLE; 523 *lenp = NILFS_FID_SIZE_NON_CONNECTABLE;
524 return 255; 524 return FILEID_INVALID;
525 } 525 }
526 526
527 fid->cno = root->cno; 527 fid->cno = root->cno;