Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[platform/kernel/linux-starfive.git] / fs / ntfs3 / inode.c

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 26a76eb..d5a3afb 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -630,12 +630,9 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,
                        bh->b_size = block_size;
                        off = vbo & (PAGE_SIZE - 1);
                        set_bh_page(bh, page, off);
-                       ll_rw_block(REQ_OP_READ, 1, &bh);
-                       wait_on_buffer(bh);
-                       if (!buffer_uptodate(bh)) {
-                               err = -EIO;
+                       err = bh_read(bh, 0);
+                       if (err < 0)
                                goto out;
-                       }
                        zero_user_segment(page, off + voff, off + block_size);
                }
        }