Commit 71a7991b authored Jan 04, 2023 by Zhang Yi Committed by Zheng Zengkai Jan 04, 2023

ocfs2: replace ll_rw_block()

mainline inclusion
from mainline-v6.1-rc1
commit 54d9171d
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=54d9171d38d904f5afde76e51bed416aaf144975

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

ll_rw_block() is not safe for the sync read path because it cannot
guarantee that submitting read IO if the buffer has been locked. We
could get false positive EIO after wait_on_buffer() if the buffer has
been locked by others. So stop using ll_rw_block() in ocfs2.

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


Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Conflict:
  fs/ocfs2/aops.c
  fs/ocfs2/super.c

Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 4c868c73

fs/ocfs2/aops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -640,7 +640,7 @@ int ocfs2_map_page_blocks(struct page page, u64 p_blkno,
		!buffer_new(bh) &&
		ocfs2_should_read_blk(inode, page, block_start) &&
		(block_start < from \|\| block_end > to)) {
		ll_rw_block(REQ_OP_READ, 0, 1, &bh);
		bh_read_nowait(bh, 0);
		*wait_bh++=bh;
		}

fs/ocfs2/super.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1772,9 +1772,7 @@ static int ocfs2_get_sector(struct super_block *sb,
		if (!buffer_dirty(*bh))
		clear_buffer_uptodate(*bh);
		unlock_buffer(*bh);
		ll_rw_block(REQ_OP_READ, 0, 1, bh);
		wait_on_buffer(*bh);
		if (!buffer_uptodate(*bh)) {
		if (bh_read(*bh, 0) < 0) {
		mlog_errno(-EIO);
		brelse(*bh);
		*bh = NULL;