On Mon, 2012-05-07 at 14:42 -0400, bjschuma@xxxxxxxxxx wrote:
> From: Bryan Schumaker <bjschuma@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> ---
> fs/nfs/super.c | 6 +++---
> include/linux/nfs4_mount.h | 1 -
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfs/super.c b/fs/nfs/super.c
> index f56fb35..40d43e0 100644
> --- 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 */
> diff --git a/include/linux/nfs4_mount.h b/include/linux/nfs4_mount.h
> index a0dcf66..a89ad72 100644
> --- a/include/linux/nfs4_mount.h
> +++ b/include/linux/nfs4_mount.h
> @@ -65,7 +65,6 @@ struct nfs4_mount_data {
> #define NFS4_MOUNT_NOCTO 0x0010 /* 1 */
> #define NFS4_MOUNT_NOAC 0x0020 /* 1 */
> #define NFS4_MOUNT_STRICTLOCK 0x1000 /* 1 */
> -#define NFS4_MOUNT_UNSHARED 0x8000 /* 1 */
> #define NFS4_MOUNT_FLAGMASK 0x9033
>
Please don't delete NFS4_MOUNT_UNSHARED from nfs4_mount.h since that is
used by (legacy) userspace mount programs.
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
��.n��������+%������w��{.n�����{��w��� jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
