2020-09-24 07:33:25

by Zhang Yi

Subject: [PATCH v2 6/7] ext4: use ext4_sb_bread() instead of sb_bread()

We have already remove open codes that invoke helpers provide by
fs/buffer.c in all places reading metadata buffers. This patch switch to
use ext4_sb_bread() to replace all sb_bread() helpers, which is
ext4_read_bh() helper back end.

Signed-off-by: zhangyi (F) <[email protected]>
---
fs/ext4/indirect.c | 6 +++---
fs/ext4/resize.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 4d7656f4ebc3..ba944d67c1c0 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -1012,14 +1012,14 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode,
}

/* Go read the buffer for the next level down */
- bh = sb_bread(inode->i_sb, nr);
+ bh = ext4_sb_bread(inode->i_sb, nr, 0);

/*
* A read failure? Report error and clear slot
* (should be rare).
*/
- if (!bh) {
- ext4_error_inode_block(inode, nr, EIO,
+ if (IS_ERR(bh)) {
+ ext4_error_inode_block(inode, nr, -PTR_ERR(bh),
"Read failure");
continue;
}
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 8596bdda304c..5e72849f1df9 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1806,8 +1806,8 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es,
o_blocks_count + add, add);

/* See if the device is actually as big as what was requested */
- bh = sb_bread(sb, o_blocks_count + add - 1);
- if (!bh) {
+ bh = ext4_sb_bread(sb, o_blocks_count + add - 1, 0);
+ if (IS_ERR(bh)) {
ext4_warning(sb, "can't read last block, resize aborted");
return -ENOSPC;
}
@@ -1932,8 +1932,8 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
int meta_bg;

/* See if the device is actually as big as what was requested */
- bh = sb_bread(sb, n_blocks_count - 1);
- if (!bh) {
+ bh = ext4_sb_bread(sb, n_blocks_count - 1, 0);
+ if (IS_ERR(bh)) {
ext4_warning(sb, "can't read last block, resize aborted");
return -ENOSPC;
}
--
2.25.4

2020-10-09 03:53:38

by Theodore Ts'o

Subject: Re: [PATCH v2 6/7] ext4: use ext4_sb_bread() instead of sb_bread()

On Thu, Sep 24, 2020 at 03:33:36PM +0800, zhangyi (F) wrote:
> We have already remove open codes that invoke helpers provide by
> fs/buffer.c in all places reading metadata buffers. This patch switch to
> use ext4_sb_bread() to replace all sb_bread() helpers, which is
> ext4_read_bh() helper back end.
>
> Signed-off-by: zhangyi (F) <[email protected]>

Thanks, applied.

- Ted