Messages in this thread Patch in this message | | | Date | Sat, 2 Feb 2008 02:34:41 +0100 | From | "Oliver Pinter (Pintér Olivér)" <> | Subject | [2.6.22.y] {16/17} - nfsv4-MAXNAME-fix.diff - series for stable kernel #2 |
| |
mainline: a16e92edcd0a2846455a30823e1bac964e743baa
-- Thanks, Oliver From: J. Bruce Fields <bfields@citi.umich.edu> Date: Fri, 28 Sep 2007 16:45:51 -0400 Subject: knfsd: query filesystem for NFSv4 getattr of FATTR4_MAXNAME References: 271803 Patch-mainline: 2.6.24 (likely)
Without this we always return 2^32-1 as the the maximum namelength.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
--- fs/nfsd/nfs4xdr.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
--- linux-2.6.22.orig/fs/nfsd/nfs4xdr.c +++ linux-2.6.22/fs/nfsd/nfs4xdr.c @@ -1453,7 +1453,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s err = vfs_getattr(exp->ex_mnt, dentry, &stat); if (err) goto out_nfserr; - if ((bmval0 & (FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL)) || + if ((bmval0 & (FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL | + FATTR4_WORD0_MAXNAME)) || (bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE | FATTR4_WORD1_SPACE_TOTAL))) { err = vfs_statfs(dentry, &statfs); @@ -1699,7 +1700,7 @@ out_acl: if (bmval0 & FATTR4_WORD0_MAXNAME) { if ((buflen -= 4) < 0) goto out_resource; - WRITE32(~(u32) 0); + WRITE32(statfs.f_namelen); } if (bmval0 & FATTR4_WORD0_MAXREAD) { if ((buflen -= 8) < 0) | |