1 files changed, 5 insertions, 5 deletions

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f1eae44b9a1a..ca20d3cc2609 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -204,9 +204,9 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
         lock_kernel();
 
         error = server->nfs_client->rpc_ops->statfs(server, fh, &res);
-        buf->f_type = NFS_SUPER_MAGIC;
         if (error < 0)
                 goto out_err;
+        buf->f_type = NFS_SUPER_MAGIC;
 
         /*
          * Current versions of glibc do not correctly handle the
@@ -233,15 +233,14 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
         buf->f_ffree = res.afiles;
 
         buf->f_namelen = server->namelen;
- out:
+
         unlock_kernel();
         return 0;
 
  out_err:
         dprintk("%s: statfs error = %d\n", __FUNCTION__, -error);
-        buf->f_bsize = buf->f_blocks = buf->f_bfree = buf->f_bavail = -1;
-        goto out;
-
+        unlock_kernel();
+        return error;
 }
 
 /*
@@ -291,6 +290,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
                 { NFS_MOUNT_NOAC, ",noac", "" },
                 { NFS_MOUNT_NONLM, ",nolock", "" },
                 { NFS_MOUNT_NOACL, ",noacl", "" },
+                { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
                 { 0, NULL, NULL }
         };
         const struct proc_nfs_info *nfs_infop;