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>

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index af4157f61927ee19332a4eea4ee455fedadeb902..1d65f6ef00ca8ba7a42eae4c3e87ff885201c43b 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -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;
                }
 

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index e2cc9eec287c9bfcf8c33fc6e8b5893aa45818b7..26b4c2bfee497e4834260643bd604b345a5e51df 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -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;