diff mbox series

[01/11] fs/ntfs3: Use bh_read to simplify code

Message ID 878105e3-d075-4d4e-5c47-3f22f95e23c8@paragon-software.com
State New
Headers
Series fs/ntfs3: Bugfix and refactoring |

Commit Message

Konstantin Komarov Feb. 15, 2023, 1:34 p.m. UTC 
  The duplicating code is replaced by a generic function bh_read()

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
  fs/ntfs3/file.c  | 10 ++--------
  fs/ntfs3/inode.c |  1 +
  2 files changed, 3 insertions(+), 8 deletions(-)

                  goto out;
diff mbox series

Patch

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index d294cd975688..d37df7376543 100644
--- 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 e80e94325467..5e06299591ed 100644
--- 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)