mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cifs: print warning when conflicting soft vs. hard mount options specified 

If the user specifies conflicting hard vs. soft mount options
(or nosoft vs. nohard) print a warning to dmesg

We were missing a warning when a user e.g. mounted with both
"hard,soft" mount options.

Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Steve French 2022-12-11 14:44:31 -06:00
parent 2bfd81043e
commit 9d91f8108e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/cifs/fs_context.c
View File

@ -884,16 +884,21 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
ctx->nodfs = 1;
break;
case Opt_hard:
if (result.negated)
if (result.negated) {
if (ctx->retry == 1)
cifs_dbg(VFS, "conflicting hard vs. soft mount options\n");
ctx->retry = 0;
else
} else
ctx->retry = 1;
break;
case Opt_soft:
if (result.negated)
ctx->retry = 1;
else
else {
if (ctx->retry == 1)
cifs_dbg(VFS, "conflicting hard vs soft mount options\n");
ctx->retry = 0;
}
break;
case Opt_mapposix:
if (result.negated)