Skip to content

Commit

Permalink
cifs: print warning when conflicting soft vs. hard mount options spec…
Browse files Browse the repository at this point in the history
…ified

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>
  • Loading branch information
Steve French committed Dec 12, 2022
1 parent 2bfd810 commit 9d91f81
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions fs/cifs/fs_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9d91f81

Please sign in to comment.