From: Chengguang Xu Date: Mon, 10 Sep 2018 23:51:54 +0000 (+0800) Subject: staging: erofs: surround fault_injection ralted option parsing using CONFIG_EROFS_FAU... X-Git-Tag: v4.20-rc1~72^2~381 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=064ee3c0da805b57d9a8dd55eff79887a8f78532;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Chao Yu Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c index 5654cc7a50155..2109b037fa177 100644 --- a/drivers/staging/erofs/super.c +++ b/drivers/staging/erofs/super.c @@ -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);