NFS: Remove NFS4_MOUNT_UNSHARED

This flag is numerically equivalent to NFS_MOUNT_UNSHARED, so I can
remove it to make collapsing functions more straightforward.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f56fb35..40d43e0 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2719,7 +2719,7 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags,
        }
        sb_mntdata.server = server;
 
-       if (server->flags & NFS4_MOUNT_UNSHARED)
+       if (server->flags & NFS_MOUNT_UNSHARED)
                compare_super = NULL;
 
        /* -o noac implies -o sync */
@@ -2983,7 +2983,7 @@ nfs4_xdev_mount(struct file_system_type *fs_type, int flags,
        }
        sb_mntdata.server = server;
 
-       if (server->flags & NFS4_MOUNT_UNSHARED)
+       if (server->flags & NFS_MOUNT_UNSHARED)
                compare_super = NULL;
 
        /* -o noac implies -o sync */
@@ -3074,7 +3074,7 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags,
        }
        sb_mntdata.server = server;
 
-       if (server->flags & NFS4_MOUNT_UNSHARED)
+       if (server->flags & NFS_MOUNT_UNSHARED)
                compare_super = NULL;
 
        /* -o noac implies -o sync */