[PATCH 09/16] fs/ntfs3: Correct use bh_read

[Konstantin Komarovc <almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>]

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>
---
 fs/ntfs3/file.c  | 19 +++++++++----------
 fs/ntfs3/inode.c |  7 +++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index a5a30a24ce5d..5691f04e6751 100644
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -188,6 +188,7 @@ static int ntfs_zero_range(struct inode *inode, u64 
vbo, u64 vbo_to)
     u32 bh_next, bh_off, to;
     sector_t iblock;
     struct folio *folio;
+    bool dirty = false;

     for (; idx < idx_end; idx += 1, from = 0) {
         page_off = (loff_t)idx << PAGE_SHIFT;
@@ -223,29 +224,27 @@ static int ntfs_zero_range(struct inode *inode, 
u64 vbo, u64 vbo_to)
             /* Ok, it's mapped. Make sure it's up-to-date. */
             if (folio_test_uptodate(folio))
                 set_buffer_uptodate(bh);
-
-            if (!buffer_uptodate(bh)) {
-                err = bh_read(bh, 0);
-                if (err < 0) {
-                    folio_unlock(folio);
-                    folio_put(folio);
-                    goto out;
-                }
+            else if (bh_read(bh, 0) < 0) {
+                err = -EIO;
+                folio_unlock(folio);
+                folio_put(folio);
+                goto out;
             }

             mark_buffer_dirty(bh);
-
         } while (bh_off = bh_next, iblock += 1,
              head != (bh = bh->b_this_page));

         folio_zero_segment(folio, from, to);
+        dirty = true;

         folio_unlock(folio);
         folio_put(folio);
         cond_resched();
     }
 out:
-    mark_inode_dirty(inode);
+    if (dirty)
+        mark_inode_dirty(inode);
     return err;
 }

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index fa6c7965473c..bba0208c4afd 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -345,9 +345,7 @@ static struct inode *ntfs_read_mft(struct inode *inode,
             inode->i_size = le16_to_cpu(rp.SymbolicLinkReparseBuffer
                                 .PrintNameLength) /
                     sizeof(u16);
-
             ni->i_valid = inode->i_size;
-
             /* Clear directory bit. */
             if (ni->ni_flags & NI_FLAG_DIR) {
                 indx_clear(&ni->dir);
@@ -653,9 +651,10 @@ static noinline int ntfs_get_block_vbo(struct inode 
*inode, u64 vbo,
             off = vbo & (PAGE_SIZE - 1);
             folio_set_bh(bh, folio, off);

-            err = bh_read(bh, 0);
-            if (err < 0)
+            if (bh_read(bh, 0) < 0) {
+                err = -EIO;
                 goto out;
+            }
             folio_zero_segment(folio, off + voff, off + block_size);
         }
     }
--
2.34.1