f2fs: introduce f2fs_is_readonly() for readability

Introduce f2fs_is_readonly() and use it to simplify code.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index cf738f1275b2d1b79c778f0e1e9f237f4684776d..eb8c27c4e5fc27a60fed837d7da9043b131da615 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4575,6 +4575,11 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
        }
 }
 
+static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
+{
+       return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
+}
+
 #define EFSBADCRC      EBADMSG         /* Bad CRC detected */
 #define EFSCORRUPTED   EUCLEAN         /* Filesystem is corrupted */
 

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index a5f6f632cf7cfd4766e00f9500060d9aa9a3c3a6..79bf1faf416167644183e0b887576a86e3f82dd1 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1351,8 +1351,7 @@ default_check:
                return -EINVAL;
        }
 
-       if ((f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb)) &&
-               test_opt(sbi, FLUSH_MERGE)) {
+       if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
                f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
                return -EINVAL;
        }
@@ -2083,7 +2082,7 @@ static void default_options(struct f2fs_sb_info *sbi)
        set_opt(sbi, MERGE_CHECKPOINT);
        F2FS_OPTION(sbi).unusable_cap = 0;
        sbi->sb->s_flags |= SB_LAZYTIME;
-       if (!f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb))
+       if (!f2fs_is_readonly(sbi))
                set_opt(sbi, FLUSH_MERGE);
        if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
                set_opt(sbi, DISCARD);