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>

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f3a0792..5bb523b 100644 (file)
--- 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)