Merge tag 'ntfs3_for_6.2' of https://github.com/Paragon-Software-Group/linux-ntfs3

[linux-block.git] / fs / ntfs3 / inode.c

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 31bc94f879409cc4fb4ac5d8c0438fd324dec4c0..20b953871574b859ff908fab4b307559bc87de90 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -636,17 +636,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);
-
-                       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 = -EIO;
+                       err = bh_read(bh, 0);
+                       if (err < 0)
                                goto out;
-                       }
                        zero_user_segment(page, off + voff, off + block_size);
                }
        }
@@ -2069,8 +2061,6 @@ const struct inode_operations ntfs_link_inode_operations = {
        .setattr        = ntfs3_setattr,
        .listxattr      = ntfs_listxattr,
        .permission     = ntfs_permission,
-       .get_acl        = ntfs_get_acl,
-       .set_acl        = ntfs_set_acl,
 };
 
 const struct address_space_operations ntfs_aops = {