Commit 9d91f810 authored by Steve French's avatar Steve French
Browse files

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: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 2bfd8104

fs/cifs/fs_context.c

+8 −3
Original line number Diff line number Diff line
@@ -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)