Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index ed0290d5ebf3a650854bda7a58436c6a0332e349..dada09b391c653a7f0fa1e6c8dd87daba0b204be 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -375,6 +375,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
        } nfs_info[] = {
                { NFS_MOUNT_SOFT, ",soft", "" },
                { NFS_MOUNT_SOFTERR, ",softerr", "" },
+               { NFS_MOUNT_SOFTREVAL, ",softreval", "" },
                { NFS_MOUNT_POSIX, ",posix", "" },
                { NFS_MOUNT_NOCTO, ",nocto", "" },
                { NFS_MOUNT_NOAC, ",noac", "" },
@@ -1205,7 +1206,7 @@ int nfs_get_tree_common(struct fs_context *fc)
        fc->s_fs_info = NULL;
        if (IS_ERR(s)) {
                error = PTR_ERR(s);
-               dfprintk(MOUNT, "NFS: Couldn't get superblock\n");
+               nfs_errorf(fc, "NFS: Couldn't get superblock");
                goto out_err_nosb;
        }
 
@@ -1234,7 +1235,7 @@ int nfs_get_tree_common(struct fs_context *fc)
 
        error = nfs_get_root(s, fc);
        if (error < 0) {
-               dfprintk(MOUNT, "NFS: Couldn't get root dentry\n");
+               nfs_errorf(fc, "NFS: Couldn't get root dentry");
                goto error_splat_super;
        }