NFS: make sure lock/nolock overriding local_lock mount option
authorChen Hanxiao <chenhx.fnst@fujitsu.com>
Tue, 2 Apr 2024 10:33:55 +0000 (18:33 +0800)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Mon, 20 May 2024 15:10:27 +0000 (11:10 -0400)
commitbf95f82e6a569f41bae1e37204b219a5e1e8b971
tree87253e50e62914168f6d5dc135a77c6cff74597c
parent7c6c5249f061b64fc6b5b90bc147169a048691bf
NFS: make sure lock/nolock overriding local_lock mount option

Currently, mount option lock/nolock and local_lock option
may override NFS_MOUNT_LOCAL_FLOCK NFS_MOUNT_LOCAL_FCNTL flags
when passing in different order:

mount -o vers=3,local_lock=all,lock:
local_lock=none

mount -o vers=3,lock,local_lock=all:
local_lock=all

This patch will let lock/nolock override local_lock option
as nfs(5) suggested.

Signed-off-by: Chen Hanxiao <chenhx.fnst@fujitsu.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/fs_context.c
fs/nfs/internal.h
fs/nfs/super.c