Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

[linux-2.6] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 719464a04ddae4fc73dc81ba982ee827631fb9ad..ca20d3cc260908b485f7d3bf4279ad3d718d97c4 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -290,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;