2023-04-10 02:22:22

by Chao Yu

Subject: [PATCH] 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 <[email protected]>
---
fs/f2fs/checkpoint.c | 2 +-
fs/f2fs/super.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 007fd965dd7e..478ee8aeac33 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -721,7 +721,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;
}
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 1573bf123197..a1b570a5e50f 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3358,7 +3358,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 {
@@ -3934,7 +3934,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;
}
--
2.25.1

2023-04-11 17:02:14

by patchwork-bot+f2fs

Subject: Re: [f2fs-dev] [PATCH] f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()

Hello:

This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:

On Mon, 10 Apr 2023 10:17:22 +0800 you wrote:
> 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.
>
> [...]

Here is the summary with links:
- [f2fs-dev] f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only()
https://git.kernel.org/jaegeuk/f2fs/c/68f0453dabdb

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html