fs/ntfs3: Use bh_read to simplify code

The duplicating code is replaced by a generic function bh_read()

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index e9bdc1ff08c97411566d558d74cb8de218fa4f0a..b3b72673fa5e24851c291c78aa86ab4cbbae805c 100644 (file)
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -223,16 +223,10 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)
                                set_buffer_uptodate(bh);
 
                        if (!buffer_uptodate(bh)) {
-                               lock_buffer(bh);
-                               bh->b_end_io = end_buffer_read_sync;
-                               get_bh(bh);
-                               submit_bh(REQ_OP_READ, bh);
-
-                               wait_on_buffer(bh);
-                               if (!buffer_uptodate(bh)) {
+                               err = bh_read(bh, 0);
+                               if (err < 0) {
                                        unlock_page(page);
                                        put_page(page);
-                                       err = -EIO;
                                        goto out;
                                }
                        }

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 3d2e4c1270e49af37773fc6b7d2f40054804f71d..bb004e47656388866f41d696c567c2f39a2bed44 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -648,6 +648,7 @@ 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);
+
                        err = bh_read(bh, 0);
                        if (err < 0)
                                goto out;