Commit 4cb037ec authored by Chengguang Xu's avatar Chengguang Xu Committed by Jaegeuk Kim

f2fs: surround fault_injection related option parsing using CONFIG_F2FS_FAULT_INJECTION

It's a little bit strange when fault_injection related
options fail with -EINVAL which were already disabled
from config, so surround all fault_injection related option
parsing code using CONFIG_F2FS_FAULT_INJECTION. Meanwhile,
slightly change warning message to keep consistency with
option POSIX_ACL and FS_XATTR.
Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c8e92757
...@@ -594,28 +594,31 @@ static int parse_options(struct super_block *sb, char *options) ...@@ -594,28 +594,31 @@ static int parse_options(struct super_block *sb, char *options)
} }
F2FS_OPTION(sbi).write_io_size_bits = arg; F2FS_OPTION(sbi).write_io_size_bits = arg;
break; break;
#ifdef CONFIG_F2FS_FAULT_INJECTION
case Opt_fault_injection: case Opt_fault_injection:
if (args->from && match_int(args, &arg)) if (args->from && match_int(args, &arg))
return -EINVAL; return -EINVAL;
#ifdef CONFIG_F2FS_FAULT_INJECTION
f2fs_build_fault_attr(sbi, arg, F2FS_ALL_FAULT_TYPE); f2fs_build_fault_attr(sbi, arg, F2FS_ALL_FAULT_TYPE);
set_opt(sbi, FAULT_INJECTION); set_opt(sbi, FAULT_INJECTION);
#else
f2fs_msg(sb, KERN_INFO,
"FAULT_INJECTION was not selected");
#endif
break; break;
case Opt_fault_type: case Opt_fault_type:
if (args->from && match_int(args, &arg)) if (args->from && match_int(args, &arg))
return -EINVAL; return -EINVAL;
#ifdef CONFIG_F2FS_FAULT_INJECTION
f2fs_build_fault_attr(sbi, 0, arg); f2fs_build_fault_attr(sbi, 0, arg);
set_opt(sbi, FAULT_INJECTION); set_opt(sbi, FAULT_INJECTION);
break;
#else #else
case Opt_fault_injection:
f2fs_msg(sb, KERN_INFO, f2fs_msg(sb, KERN_INFO,
"FAULT_INJECTION was not selected"); "fault_injection options not supported");
#endif
break; break;
case Opt_fault_type:
f2fs_msg(sb, KERN_INFO,
"fault_type options not supported");
break;
#endif
case Opt_lazytime: case Opt_lazytime:
sb->s_flags |= SB_LAZYTIME; sb->s_flags |= SB_LAZYTIME;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment