diff options
| author | Steve French <stfrench@microsoft.com> | 2022-12-11 23:44:31 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2022-12-12 22:08:22 +0300 |
| commit | 9d91f8108ebfed54284332e04d2073107df18794 (patch) | |
| tree | f58e997745885a1afeb17d107da75117622e60a7 | |
| parent | 2bfd81043e944af0e52835ef6d9b41795af22341 (diff) | |
| download | linux-9d91f8108ebfed54284332e04d2073107df18794.tar.xz | |
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>
| -rw-r--r-- | fs/cifs/fs_context.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c index 45119597c765..2c92a821e028 100644 --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -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) |