Commit cbeebc7c authored by Zhang Yi's avatar Zhang Yi Committed by Zheng Zengkai
Browse files

ext2: replace bh_submit_read() helper with bh_read() 

mainline inclusion
from mainline-v6.1-rc1
commit 28cf7559
category: bugfix
bugzilla: 187878,https://gitee.com/openeuler/kernel/issues/I5QJH9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.1-rc2&id=28cf75591008eef5e1649de31c4ddee5bf20081d

--------------------------------

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.

Link: https://lkml.kernel.org/r/20220901133505.2510834-14-yi.zhang@huawei.com


Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 67fcefb9

fs/ext2/balloc.c

+4 −3
Original line number Diff line number Diff line
@@ -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 - "