Commit c8e47028 authored by Scott Mayhew's avatar Scott Mayhew Committed by Trond Myklebust
Browse files

nfs: Apply NFS_MOUNT_CMP_FLAGMASK to nfs_compare_remount_data() 



Those flags are obsolete and checking them can incorrectly cause
remount operations to fail.

Signed-off-by: default avatarScott Mayhew <smayhew@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 8935ef66

fs/nfs/super.c

+13 −13
Original line number Diff line number Diff line
@@ -2180,11 +2180,23 @@ static int nfs_validate_text_mount_data(void *options, 
	return -EINVAL;

}



#define NFS_MOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \

		| NFS_MOUNT_SECURE \

		| NFS_MOUNT_TCP \

		| NFS_MOUNT_VER3 \

		| NFS_MOUNT_KERBEROS \

		| NFS_MOUNT_NONLM \

		| NFS_MOUNT_BROKEN_SUID \

		| NFS_MOUNT_STRICTLOCK \

		| NFS_MOUNT_UNSHARED \

		| NFS_MOUNT_NORESVPORT \

		| NFS_MOUNT_LEGACY_INTERFACE)



static int

nfs_compare_remount_data(struct nfs_server *nfss,

			 struct nfs_parsed_mount_data *data)

{

	if (data->flags != nfss->flags ||

	if ((data->flags ^ nfss->flags) & NFS_MOUNT_CMP_FLAGMASK ||

	    data->rsize != nfss->rsize ||

	    data->wsize != nfss->wsize ||

	    data->version != nfss->nfs_client->rpc_ops->version ||
@@ -2347,18 +2359,6 @@ void nfs_clone_super(struct super_block *sb, struct nfs_mount_info *mount_info) 
 	nfs_initialise_sb(sb);

}



#define NFS_MOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \

		| NFS_MOUNT_SECURE \

		| NFS_MOUNT_TCP \

		| NFS_MOUNT_VER3 \

		| NFS_MOUNT_KERBEROS \

		| NFS_MOUNT_NONLM \

		| NFS_MOUNT_BROKEN_SUID \

		| NFS_MOUNT_STRICTLOCK \

		| NFS_MOUNT_UNSHARED \

		| NFS_MOUNT_NORESVPORT \

		| NFS_MOUNT_LEGACY_INTERFACE)



static int nfs_compare_mount_options(const struct super_block *s, const struct nfs_server *b, int flags)

{

	const struct nfs_server *a = s->s_fs_info;