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

fs/buffer: replace ll_rw_block() 

mainline inclusion
from mainline-v6.1-rc1
commit e7ea1129
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=e7ea1129afab0e63af2c2d0e6e9fb7651f0982b3

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

ll_rw_block() is not safe for the sync IO path because it skip buffers
which has been locked by others, it could lead to false positive EIO
when submitting read IO. So stop using ll_rw_block(), switch to use new
helpers which could guarantee buffer locked and submit IO if needed.

Link: https://lkml.kernel.org/r/20220901133505.2510834-4-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>

Conflict:
  fs/buffer.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 007d01be

fs/buffer.c

+5 −7
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ void write_boundary_block(struct block_device *bdev, 
	struct buffer_head *bh = __find_get_block(bdev, bblock + 1, blocksize);

	if (bh) {

		if (buffer_dirty(bh))

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

			write_dirty_buffer(bh, 0);

		put_bh(bh);

	}

}
@@ -1363,7 +1363,7 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size) 
{

	struct buffer_head *bh = __getblk(bdev, block, size);

	if (likely(bh)) {

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

		bh_readahead(bh, REQ_RAHEAD);

		brelse(bh);

	}

}
@@ -2038,7 +2038,7 @@ int __block_write_begin_int(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);

			bh_read_nowait(bh, 0);

			*wait_bh++=bh;

		}

	}
@@ -2927,11 +2927,9 @@ int block_truncate_page(struct address_space *mapping, 
		set_buffer_uptodate(bh);



	if (!buffer_uptodate(bh) && !buffer_delay(bh) && !buffer_unwritten(bh)) {

		err = -EIO;

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

		wait_on_buffer(bh);

		err = bh_read(bh, 0);

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

		if (!buffer_uptodate(bh))

		if (err < 0)

			goto unlock;

	}