mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
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>
This commit is contained in:
parent
e480751970
commit
ed8ac22b6b
2 changed files with 7 additions and 3 deletions
|
@ -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 */
|
||||
|
||||
|
|
|
@ -1351,8 +1351,7 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
|
|||
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);
|
||||
|
|
Loading…
Reference in a new issue