Commit 68f0453d authored Apr 10, 2023 by Chao Yu Committed by Jaegeuk Kim Apr 10, 2023

f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()



f2fs has supported multi-device feature, to check devices' rw status,
it should use f2fs_hw_is_readonly() rather than bdev_read_only(), fix
it.

Meanwhile, it removes f2fs_hw_is_readonly() check condition in:
- f2fs_write_checkpoint()
- f2fs_convert_inline_inode()
As it has checked f2fs_readonly() condition, and if f2fs' devices
were readonly, f2fs_readonly() must be true.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 0c9f4521

fs/f2fs/checkpoint.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -715,7 +715,7 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi)
		if (!is_set_ckpt_flags(sbi, CP_ORPHAN_PRESENT_FLAG))
		return 0;

		if (bdev_read_only(sbi->sb->s_bdev)) {
		if (f2fs_hw_is_readonly(sbi)) {
		f2fs_info(sbi, "write access unavailable, skipping orphan cleanup");
		return 0;
		}

fs/f2fs/super.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3274,7 +3274,7 @@ static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,
		raw_super->segment_count = cpu_to_le32((main_end_blkaddr -
		segment0_blkaddr) >> log_blocks_per_seg);

		if (f2fs_readonly(sb) \|\| bdev_read_only(sb->s_bdev)) {
		if (f2fs_readonly(sb) \|\| f2fs_hw_is_readonly(sbi)) {
		set_sbi_flag(sbi, SBI_NEED_SB_WRITE);
		res = "internally";
		} else {
		@@ -3850,7 +3850,7 @@ int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
		int err;

		if ((recover && f2fs_readonly(sbi->sb)) \|\|
		bdev_read_only(sbi->sb->s_bdev)) {
		f2fs_hw_is_readonly(sbi)) {
		set_sbi_flag(sbi, SBI_NEED_SB_WRITE);
		return -EROFS;
		}