Commit 064ee3c0 authored Sep 11, 2018 by Chengguang Xu Committed by Greg Kroah-Hartman Sep 14, 2018

staging: erofs: surround fault_injection ralted option parsing using CONFIG_EROFS_FAULT_INJECTION



It's a little bit strange when fault_injection related
option fail with -EINVAL which was already disabled
from config, so surround all fault_injection related option
parsing code using CONFIG_EROFS_FAULT_INJECTION. Meanwhile,
slightly change warning message to keep consistency with
option POSIX_ACL and FS_XATTR.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7dd68b14

drivers/staging/erofs/super.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -237,16 +237,18 @@ static int parse_options(struct super_block sb, char options)
		infoln("noacl options not supported");
		break;
		#endif
		#ifdef CONFIG_EROFS_FAULT_INJECTION
		case Opt_fault_injection:
		if (args->from && match_int(args, &arg))
		return -EINVAL;
		#ifdef CONFIG_EROFS_FAULT_INJECTION
		erofs_build_fault_attr(EROFS_SB(sb), arg);
		set_opt(EROFS_SB(sb), FAULT_INJECTION);
		break;
		#else
		infoln("FAULT_INJECTION was not selected");
		#endif
		case Opt_fault_injection:
		infoln("fault_injection options not supported");
		break;
		#endif
		default:
		errln("Unrecognized mount option \"%s\" "
		"or missing value", p);

Admin message