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

gfs2: replace ll_rw_block() 

mainline inclusion
from mainline-v6.1-rc1
commit 86a020cc
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=86a020cc7232c3defad370852415876bbe4576dc

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

ll_rw_block() is not safe for the sync read path because it cannot
guarantee that always submitting read IO if the buffer has been locked,
so stop using it. We also switch to new bh_readahead() helper for the
readahead path.

Link: https://lkml.kernel.org/r/20220901133505.2510834-5-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 avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>

Conflict:
  fs/gfs2/meta_io.c
  fs/gfs2/quota.c

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 910ab1ae

fs/gfs2/meta_io.c

+2 −6
Original line number Diff line number Diff line
@@ -521,8 +521,7 @@ struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen) 


	if (buffer_uptodate(first_bh))

		goto out;

	if (!buffer_locked(first_bh))

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

	bh_read_nowait(first_bh, REQ_META | REQ_PRIO);



	dblock++;

	extlen--;
@@ -530,10 +529,7 @@ struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen) 
	while (extlen) {

		bh = gfs2_getbuf(gl, dblock, CREATE);



		if (!buffer_uptodate(bh) && !buffer_locked(bh))

			ll_rw_block(REQ_OP_READ,

				    REQ_RAHEAD | REQ_META | REQ_PRIO,

				    1, &bh);

		bh_readahead(bh, REQ_RAHEAD | REQ_META | REQ_PRIO);

		brelse(bh);

		dblock++;

		extlen--;

fs/gfs2/quota.c

+2 −6
Original line number Diff line number Diff line
@@ -741,12 +741,8 @@ static int gfs2_write_buf_to_page(struct gfs2_inode *ip, unsigned long index, 
		}

		if (PageUptodate(page))

			set_buffer_uptodate(bh);

		if (!buffer_uptodate(bh)) {

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

			wait_on_buffer(bh);

			if (!buffer_uptodate(bh))

		if (bh_read(bh, REQ_META | REQ_PRIO) < 0)

			goto unlock_out;

		}

		if (gfs2_is_jdata(ip))

			gfs2_trans_add_data(ip->i_gl, bh);

		else