summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorDan Aloni <dan.aloni@vastdata.com>2022-05-08 15:54:50 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-05-18 11:23:43 +0300
commit2cb8689f45f2bf5843e60a028f0981a38fa2f5c4 (patch)
tree4383d0a927e758f20ae6e0fa8eccedb1208b720b /fs/nfs
parent49c10784b9550d5fe84d2482fb4b99577795a7b0 (diff)
downloadlinux-2cb8689f45f2bf5843e60a028f0981a38fa2f5c4.tar.xz
nfs: fix broken handling of the softreval mount option
[ Upstream commit 085d16d5f949b64713d5e960d6c9bbf51bc1d511 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/nfs')
-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 05b39e8f97b9..d60c086c6e9c 100644
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -476,7 +476,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)