summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDan Aloni <dan.aloni@vastdata.com>2022-05-08 14:54:50 +0200
committerTrond Myklebust <trond.myklebust@hammerspace.com>2022-05-09 19:02:54 +0200
commit085d16d5f949b64713d5e960d6c9bbf51bc1d511 (patch)
treedfb4a9b4fc9b2c96fb89b43c6f0eec4d45ff184b /fs
parentSUNRPC: Ensure that the gssproxy client can start in a connected state (diff)
downloadlinux-085d16d5f949b64713d5e960d6c9bbf51bc1d511.tar.xz
linux-085d16d5f949b64713d5e960d6c9bbf51bc1d511.zip
nfs: fix broken handling of the softreval mount option
Turns out that ever since this mount option was added, passing `softreval` in NFS mount options cancelled all other flags while not affecting the underlying flag `NFS_MOUNT_SOFTREVAL`. Fixes: c74dfe97c104 ("NFS: Add mount option 'softreval'") Signed-off-by: Dan Aloni <dan.aloni@vastdata.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/fs_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index e2d59bb5e6bb..9a16897e8dc6 100644
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -517,7 +517,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
if (result.negated)
ctx->flags &= ~NFS_MOUNT_SOFTREVAL;
else
- ctx->flags &= NFS_MOUNT_SOFTREVAL;
+ ctx->flags |= NFS_MOUNT_SOFTREVAL;
break;
case Opt_posix:
if (result.negated)