mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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.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>
This commit is contained in:
parent
6bf414a00a
commit
54d9171d38
|
@ -636,7 +636,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, 1, &bh);
|
||||
bh_read_nowait(bh, 0);
|
||||
*wait_bh++=bh;
|
||||
}
|
||||
|
||||
|
|
|
@ -1764,9 +1764,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, 1, bh);
|
||||
wait_on_buffer(*bh);
|
||||
if (!buffer_uptodate(*bh)) {
|
||||
if (bh_read(*bh, 0) < 0) {
|
||||
mlog_errno(-EIO);
|
||||
brelse(*bh);
|
||||
*bh = NULL;
|
||||
|
|
Loading…
Reference in a new issue