diff options
| author | Chao Yu <yuchao0@huawei.com> | 2020-09-03 10:14:41 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-09-11 11:11:25 -0700 |
| commit | 69c0dd29f75292cf90f032365e0f9d96b7ded5ca (patch) | |
| tree | 5c55f8f82e313f5853c70158c88ce6300be491c1 /fs/f2fs/super.c | |
| parent | ca313c82d15130ccfde861105cd288be47d05e34 (diff) | |
| download | linux-69c0dd29f75292cf90f032365e0f9d96b7ded5ca.tar.bz2 | |
f2fs: ignore compress mount option on image w/o compression feature
to keep consistent with behavior when passing compress mount option
to kernel w/o compression feature, so that mount may not fail on
such condition.
Reported-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/super.c')
| -rw-r--r-- | fs/f2fs/super.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index f3a07921d4f7..5bb523bf32a6 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -871,8 +871,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) #ifdef CONFIG_F2FS_FS_COMPRESSION case Opt_compress_algorithm: if (!f2fs_sb_has_compression(sbi)) { - f2fs_err(sbi, "Compression feature if off"); - return -EINVAL; + f2fs_info(sbi, "Image doesn't support compression"); + break; } name = match_strdup(&args[0]); if (!name) @@ -897,8 +897,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) break; case Opt_compress_log_size: if (!f2fs_sb_has_compression(sbi)) { - f2fs_err(sbi, "Compression feature is off"); - return -EINVAL; + f2fs_info(sbi, "Image doesn't support compression"); + break; } if (args->from && match_int(args, &arg)) return -EINVAL; @@ -912,8 +912,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) break; case Opt_compress_extension: if (!f2fs_sb_has_compression(sbi)) { - f2fs_err(sbi, "Compression feature is off"); - return -EINVAL; + f2fs_info(sbi, "Image doesn't support compression"); + break; } name = match_strdup(&args[0]); if (!name) |