On Thu 01-09-22 21:35:04, Zhang Yi wrote:
> bh_submit_read() and the uptodate check logic in bh_uptodate_or_lock()
> has been integrated in bh_read() helper, so switch to use it directly.
>
> Signed-off-by: Zhang Yi <yi.zhang@xxxxxxxxxx>
Looks good to me. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/ext2/balloc.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
> index c17ccc19b938..5dc0a31f4a08 100644
> --- a/fs/ext2/balloc.c
> +++ b/fs/ext2/balloc.c
> @@ -126,6 +126,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
> struct ext2_group_desc * desc;
> struct buffer_head * bh = NULL;
> ext2_fsblk_t bitmap_blk;
> + int ret;
>
> desc = ext2_get_group_desc(sb, block_group, NULL);
> if (!desc)
> @@ -139,10 +140,10 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
> block_group, le32_to_cpu(desc->bg_block_bitmap));
> return NULL;
> }
> - if (likely(bh_uptodate_or_lock(bh)))
> + ret = bh_read(bh, 0);
> + if (ret > 0)
> return bh;
> -
> - if (bh_submit_read(bh) < 0) {
> + if (ret < 0) {
> brelse(bh);
> ext2_error(sb, __func__,
> "Cannot read block bitmap - "
> --
> 2.31.1
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
