Commit 54d9171d authored by Zhang Yi's avatar Zhang Yi Committed by Andrew Morton

ocfs2: replace ll_rw_block()

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.comSigned-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>
parent 6bf414a0
...@@ -636,7 +636,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno, ...@@ -636,7 +636,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,
!buffer_new(bh) && !buffer_new(bh) &&
ocfs2_should_read_blk(inode, page, block_start) && ocfs2_should_read_blk(inode, page, block_start) &&
(block_start < from || block_end > to)) { (block_start < from || block_end > to)) {
ll_rw_block(REQ_OP_READ, 1, &bh); bh_read_nowait(bh, 0);
*wait_bh++=bh; *wait_bh++=bh;
} }
......
...@@ -1764,9 +1764,7 @@ static int ocfs2_get_sector(struct super_block *sb, ...@@ -1764,9 +1764,7 @@ static int ocfs2_get_sector(struct super_block *sb,
if (!buffer_dirty(*bh)) if (!buffer_dirty(*bh))
clear_buffer_uptodate(*bh); clear_buffer_uptodate(*bh);
unlock_buffer(*bh); unlock_buffer(*bh);
ll_rw_block(REQ_OP_READ, 1, bh); if (bh_read(*bh, 0) < 0) {
wait_on_buffer(*bh);
if (!buffer_uptodate(*bh)) {
mlog_errno(-EIO); mlog_errno(-EIO);
brelse(*bh); brelse(*bh);
*bh = NULL; *bh = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment