Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux

* 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux:
  knfsd: query filesystem for NFSv4 getattr of FATTR4_MAXNAME
  knfsd: nfsv4 delegation recall should take reference on client
  knfsd: don't shutdown callbacks until nfsv4 client is freed
  knfsd: let nfsd manage timing out its own leases
  knfsd: Add source address to sunrpc svc errors
  knfsd: 64 bit ino support for NFS server
  svcgss: move init code into separate function
  knfsd: remove code duplication in nfsd4_setclientid()
  nfsd warning fix
  knfsd: fix callback rpc cred
  knfsd: move nfsv4 slab creation/destruction to module init/exit
  knfsd: spawn kernel thread to probe callback channel
  knfsd: nfs4 name->id mapping not correctly parsing negative downcall
  knfsd: demote some printk()s to dprintk()s
  knfsd: cleanup of nfsd4 cmp_* functions
  knfsd: delete code made redundant by map_new_errors
  nfsd: fix horrible indentation in nfsd_setattr
  nfsd: remove unused cache_for_each macro
  nfsd: tone down inaccurate dprintk

1 files changed, 11 insertions, 11 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 8ef0964179bc..e15f2cf8ac15 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1475,7 +1475,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
         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);
@@ -1679,7 +1680,7 @@ out_acl:
         if (bmval0 & FATTR4_WORD0_FILEID) {
                 if ((buflen -= 8) < 0)
                         goto out_resource;
-                WRITE64((u64) stat.ino);
+                WRITE64(stat.ino);
         }
         if (bmval0 & FATTR4_WORD0_FILES_AVAIL) {
                 if ((buflen -= 8) < 0)
@@ -1721,7 +1722,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)
@@ -1821,16 +1822,15 @@ out_acl:
                 WRITE32(stat.mtime.tv_nsec);
         }
         if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {
-                struct dentry *mnt_pnt, *mnt_root;
-
                 if ((buflen -= 8) < 0)
                         goto out_resource;
-                mnt_root = exp->ex_mnt->mnt_root;
-                if (mnt_root->d_inode == dentry->d_inode) {
-                        mnt_pnt = exp->ex_mnt->mnt_mountpoint;
-                        WRITE64((u64) mnt_pnt->d_inode->i_ino);
-                } else
-                        WRITE64((u64) stat.ino);
+                if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) {
+                        err = vfs_getattr(exp->ex_mnt->mnt_parent,
+                                exp->ex_mnt->mnt_mountpoint, &stat);
+                        if (err)
+                                goto out_nfserr;
+                }
+                WRITE64(stat.ino);
         }
         *attrlenp = htonl((char *)p - (char *)attrlenp - 4);
         *countp = p - buffer;