Commit 01c3f052 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix the 'nolock' option regression 

NFSv4 should just ignore the 'nolock' option. It is an NFSv2/v3 thing...
This fixes the Oops in http://bugzilla.kernel.org/show_bug.cgi?id=13330



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 88b5ed73

fs/nfs/super.c

+7 −0
Original line number Diff line number Diff line
@@ -2240,6 +2240,11 @@ static void nfs4_fill_super(struct super_block *sb) 
	nfs_initialise_sb(sb);

}



static void nfs4_validate_mount_flags(struct nfs_parsed_mount_data *args)

{

	args->flags &= ~(NFS_MOUNT_NONLM|NFS_MOUNT_NOACL|NFS_MOUNT_VER3);

}



/*

 * Validate NFSv4 mount options

 */
@@ -2336,6 +2341,8 @@ static int nfs4_validate_mount_data(void *options, 


		nfs_validate_transport_protocol(args);



		nfs4_validate_mount_flags(args);



		if (args->auth_flavor_len > 1)

			goto out_inval_auth;