Opt_compress_chksum, Opt_compress_mode and Opt_compress_cache
lack the necessary check to see if the image supports compression,
let's add it.

Signed-off-by: Yangtao Li <[email protected]>
---
v2:
-drop f2fs_mount_opt_need_skip()
 fs/f2fs/super.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9c87d91df61b..a88706bbfc0d 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1179,9 +1179,17 @@ static int parse_options(struct super_block *sb, char 
*options, bool is_remount)
                        kfree(name);
                        break;
                case Opt_compress_chksum:
+                       if (!f2fs_sb_has_compression(sbi)) {
+                               f2fs_info(sbi, "Image doesn't support 
compression");
+                               break;
+                       }
                        F2FS_OPTION(sbi).compress_chksum = true;
                        break;
                case Opt_compress_mode:
+                       if (!f2fs_sb_has_compression(sbi)) {
+                               f2fs_info(sbi, "Image doesn't support 
compression");
+                               break;
+                       }
                        name = match_strdup(&args[0]);
                        if (!name)
                                return -ENOMEM;
@@ -1196,6 +1204,10 @@ static int parse_options(struct super_block *sb, char 
*options, bool is_remount)
                        kfree(name);
                        break;
                case Opt_compress_cache:
+                       if (!f2fs_sb_has_compression(sbi)) {
+                               f2fs_info(sbi, "Image doesn't support 
compression");
+                               break;
+                       }
                        set_opt(sbi, COMPRESS_CACHE);
                        break;
 #else
-- 
2.35.1



_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

Reply via email to