Merge tag 'mm-nonmm-stable-2022-10-11' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / fs / ufs / balloc.c

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index bd810d8239f2ac8f6c51de36d6a8e319f93cf046..2436e3f82147fd4ede1a6b24c845133cc63c0d5e 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",