Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 330e9aff authored by Yangtao Li's avatar Yangtao Li Committed by Jaegeuk Kim
Browse files

f2fs: introduce f2fs_is_readonly() for readability 



Introduce f2fs_is_readonly() and use it to simplify code.

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 32bc64aa

fs/f2fs/f2fs.h

+5 −0
Original line number Diff line number Diff line
@@ -4674,6 +4674,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 */

fs/f2fs/super.c

+2 −3
Original line number Diff line number Diff line
@@ -1327,8 +1327,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;

	}
@@ -2062,7 +2061,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);