Commit 2d069c08 authored by zhangyi (F)'s avatar zhangyi (F) Committed by Theodore Ts'o
Browse files

ext4: use common helpers in all places reading metadata buffers 



Revome all open codes that read metadata buffers, switch to use
ext4_read_bh_*() common helpers.

Signed-off-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Suggested-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20200924073337.861472-4-yi.zhang@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent fa491b14

fs/ext4/balloc.c

+3 −5
Original line number Diff line number Diff line
@@ -494,12 +494,10 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group, 
	 * submit the buffer_head for reading

	 */

	set_buffer_new(bh);

	clear_buffer_verified(bh);

	trace_ext4_read_block_bitmap_load(sb, block_group, ignore_locked);

	bh->b_end_io = ext4_end_bitmap_read;

	get_bh(bh);

	submit_bh(REQ_OP_READ, REQ_META | REQ_PRIO |

		  (ignore_locked ? REQ_RAHEAD : 0), bh);

	ext4_read_bh_nowait(bh, REQ_META | REQ_PRIO |

			    (ignore_locked ? REQ_RAHEAD : 0),

			    ext4_end_bitmap_read);

	return bh;

verify:

	err = ext4_validate_block_bitmap(sb, desc, block_group, bh);

fs/ext4/extents.c

+1 −2
Original line number Diff line number Diff line
@@ -501,8 +501,7 @@ __read_extent_tree_block(const char *function, unsigned int line, 


	if (!bh_uptodate_or_lock(bh)) {

		trace_ext4_ext_load_extent(inode, pblk, _RET_IP_);

		clear_buffer_verified(bh);

		err = bh_submit_read(bh);

		err = ext4_read_bh(bh, 0, NULL);

		if (err < 0)

			goto errout;

	}

fs/ext4/ialloc.c

+1 −5
Original line number Diff line number Diff line
@@ -188,12 +188,8 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group) 
	/*

	 * submit the buffer_head for reading

	 */

	clear_buffer_verified(bh);

	trace_ext4_load_inode_bitmap(sb, block_group);

	bh->b_end_io = ext4_end_bitmap_read;

	get_bh(bh);

	submit_bh(REQ_OP_READ, REQ_META | REQ_PRIO, bh);

	wait_on_buffer(bh);

	ext4_read_bh(bh, REQ_META | REQ_PRIO, ext4_end_bitmap_read);

	ext4_simulate_fail_bh(sb, bh, EXT4_SIM_IBITMAP_EIO);

	if (!buffer_uptodate(bh)) {

		put_bh(bh);

fs/ext4/indirect.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth, 
		}



		if (!bh_uptodate_or_lock(bh)) {

			if (bh_submit_read(bh) < 0) {

			if (ext4_read_bh(bh, 0, NULL) < 0) {

				put_bh(bh);

				goto failure;

			}

fs/ext4/inode.c

+14 −21
Original line number Diff line number Diff line
@@ -878,19 +878,20 @@ struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode, 
			       ext4_lblk_t block, int map_flags)

{

	struct buffer_head *bh;

	int ret;



	bh = ext4_getblk(handle, inode, block, map_flags);

	if (IS_ERR(bh))

		return bh;

	if (!bh || ext4_buffer_uptodate(bh))

		return bh;

	clear_buffer_verified(bh);

	ll_rw_block(REQ_OP_READ, REQ_META | REQ_PRIO, 1, &bh);

	wait_on_buffer(bh);

	if (buffer_uptodate(bh))

		return bh;



	ret = ext4_read_bh_lock(bh, REQ_META | REQ_PRIO, true);

	if (ret) {

		put_bh(bh);

	return ERR_PTR(-EIO);

		return ERR_PTR(ret);

	}

	return bh;

}



/* Read a contiguous batch of blocks. */
@@ -910,11 +911,8 @@ int ext4_bread_batch(struct inode *inode, ext4_lblk_t block, int bh_count, 


	for (i = 0; i < bh_count; i++)

		/* Note that NULL bhs[i] is valid because of holes. */

		if (bhs[i] && !ext4_buffer_uptodate(bhs[i])) {

			clear_buffer_verified(bhs[i]);

			ll_rw_block(REQ_OP_READ, REQ_META | REQ_PRIO, 1,

				    &bhs[i]);

		}

		if (bhs[i] && !ext4_buffer_uptodate(bhs[i]))

			ext4_read_bh_lock(bhs[i], REQ_META | REQ_PRIO, false);



	if (!wait)

		return 0;
@@ -1084,7 +1082,7 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, 
		if (!buffer_uptodate(bh) && !buffer_delay(bh) &&

		    !buffer_unwritten(bh) &&

		    (block_start < from || block_end > to)) {

			ll_rw_block(REQ_OP_READ, 0, 1, &bh);

			ext4_read_bh_lock(bh, 0, false);

			wait[nr_wait++] = bh;

		}

	}
@@ -3756,11 +3754,8 @@ static int __ext4_block_zero_page_range(handle_t *handle, 
		set_buffer_uptodate(bh);



	if (!buffer_uptodate(bh)) {

		err = -EIO;

		ll_rw_block(REQ_OP_READ, 0, 1, &bh);

		wait_on_buffer(bh);

		/* Uhhuh. Read error. Complain and punt. */

		if (!buffer_uptodate(bh))

		err = ext4_read_bh_lock(bh, 0, true);

		if (err)

			goto unlock;

		if (fscrypt_inode_uses_fs_layer_crypto(inode)) {

			/* We expect the key to be set. */
@@ -4404,9 +4399,7 @@ make_io: 
		 * Read the block from disk.

		 */

		trace_ext4_load_inode(inode);

		get_bh(bh);

		bh->b_end_io = end_buffer_read_sync;

		submit_bh(REQ_OP_READ, REQ_META | REQ_PRIO, bh);

		ext4_read_bh_nowait(bh, REQ_META | REQ_PRIO, NULL);

		blk_finish_plug(&plug);

		wait_on_buffer(bh);

		if (!buffer_uptodate(bh)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE