Commit 0a846f49 authored by zhangyi (F)'s avatar zhangyi (F) Committed by Theodore Ts'o

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: default avatarzhangyi (F) <yi.zhang@huawei.com>
Link: https://lore.kernel.org/r/20200924073337.861472-7-yi.zhang@huawei.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5df1d412
...@@ -1013,14 +1013,14 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode, ...@@ -1013,14 +1013,14 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode,
} }
/* Go read the buffer for the next level down */ /* 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 * A read failure? Report error and clear slot
* (should be rare). * (should be rare).
*/ */
if (!bh) { if (IS_ERR(bh)) {
ext4_error_inode_block(inode, nr, EIO, ext4_error_inode_block(inode, nr, -PTR_ERR(bh),
"Read failure"); "Read failure");
continue; continue;
} }
......
...@@ -1808,8 +1808,8 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, ...@@ -1808,8 +1808,8 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es,
o_blocks_count + add, add); o_blocks_count + add, add);
/* See if the device is actually as big as what was requested */ /* See if the device is actually as big as what was requested */
bh = sb_bread(sb, o_blocks_count + add - 1); bh = ext4_sb_bread(sb, o_blocks_count + add - 1, 0);
if (!bh) { if (IS_ERR(bh)) {
ext4_warning(sb, "can't read last block, resize aborted"); ext4_warning(sb, "can't read last block, resize aborted");
return -ENOSPC; return -ENOSPC;
} }
...@@ -1934,8 +1934,8 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count) ...@@ -1934,8 +1934,8 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
int meta_bg; int meta_bg;
/* See if the device is actually as big as what was requested */ /* See if the device is actually as big as what was requested */
bh = sb_bread(sb, n_blocks_count - 1); bh = ext4_sb_bread(sb, n_blocks_count - 1, 0);
if (!bh) { if (IS_ERR(bh)) {
ext4_warning(sb, "can't read last block, resize aborted"); ext4_warning(sb, "can't read last block, resize aborted");
return -ENOSPC; return -ENOSPC;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment