On 2018/9/10 23:48, Chengguang Xu wrote: > 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: Chengguang Xu <cgxu...@gmx.com> > --- > fs/f2fs/super.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 896b885f504e..cc49cc10d9f5 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -602,28 +602,31 @@ static int parse_options(struct super_block *sb, char > *options) > } > F2FS_OPTION(sbi).write_io_size_bits = arg; > break; > +#ifdef CONFIG_F2FS_FAULT_INJECTION > case Opt_fault_injection: > if (args->from && match_int(args, &arg)) > return -EINVAL; > -#ifdef CONFIG_F2FS_FAULT_INJECTION > f2fs_build_fault_attr(sbi, arg, F2FS_ALL_FAULT_TYPE); > set_opt(sbi, FAULT_INJECTION); > -#else > - f2fs_msg(sb, KERN_INFO, > - "FAULT_INJECTION was not selected"); > -#endif > break; > + > case Opt_fault_type: > if (args->from && match_int(args, &arg)) > return -EINVAL; > -#ifdef CONFIG_F2FS_FAULT_INJECTION > f2fs_build_fault_attr(sbi, 0, arg); > set_opt(sbi, FAULT_INJECTION); > + break; > #else > + case Opt_fault_injection: > f2fs_msg(sb, KERN_INFO, > - "FAULT_INJECTION was not selected"); > -#endif > + "FAULT_INJECTION not supported");
"fault_injection options not supported" > break; > + > + case Opt_fault_type: > + f2fs_msg(sb, KERN_INFO, > + "FAULT_INJECTION not supported"); "fault_type options not supported" Thanks, > + break; > +#endif > case Opt_lazytime: > sb->s_flags |= SB_LAZYTIME; > break; > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
