ufs: 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 ufs.

Link: https://lkml.kernel.org/r/20220901133505.2510834-12-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/ufs/balloc.c b/fs/ufs/balloc.c
index bd810d8..2436e3f 100644 (file)
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -295,14 +295,10 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg,
 
                        if (!buffer_mapped(bh))
                                        map_bh(bh, inode->i_sb, oldb + pos);
-                       if (!buffer_uptodate(bh)) {
-                               ll_rw_block(REQ_OP_READ, 1, &bh);
-                               wait_on_buffer(bh);
-                               if (!buffer_uptodate(bh)) {
-                                       ufs_error(inode->i_sb, __func__,
-                                                 "read of block failed\n");
-                                       break;
-                               }
+                       if (bh_read(bh, 0) < 0) {
+                               ufs_error(inode->i_sb, __func__,
+                                         "read of block failed\n");
+                               break;
                        }
 
                        UFSD(" change from %llu to %llu, pos %u\n",