diff mbox series

[03/16] fs/ntfs3: Improve ntfs_dir_count

Message ID d39096b0-3bea-4044-9fdf-0decb1011ec4@paragon-software.com
State New
Headers
Series fs/ntfs3: Bugfix and refactoring |

Commit Message

Konstantin Komarov Dec. 6, 2023, 3:10 p.m. UTC 
  Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
  fs/ntfs3/dir.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)

          *is_empty = true;
@@ -563,7 +561,7 @@ static int ntfs_dir_count(struct inode *dir, bool 
*is_empty, size_t *dirs,
                  fles += 1;
          }

-        if (vbo >= i_size)
+        if (bit >= max_indx)
              goto out;

          err = indx_used_bit(&ni->dir, ni, &bit);
@@ -573,8 +571,7 @@ static int ntfs_dir_count(struct inode *dir, bool 
*is_empty, size_t *dirs,
          if (bit == MINUS_ONE_T)
              goto out;

-        vbo = (u64)bit << index_bits;
-        if (vbo >= i_size)
+        if (bit >= max_indx)
              goto out;

          err = indx_read(&ni->dir, ni, bit << ni->dir.idx2vbn_bits,
@@ -584,7 +581,6 @@ static int ntfs_dir_count(struct inode *dir, bool 
*is_empty, size_t *dirs,

          hdr = &node->index->ihdr;
          bit += 1;
-        vbo = (u64)bit << ni->dir.idx2vbn_bits;
      }

  out:
diff mbox series

Patch

diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c
index 22ede4da0450..726122ecd39b 100644
--- a/fs/ntfs3/dir.c
+++ b/fs/ntfs3/dir.c
@@ -515,11 +515,9 @@  static int ntfs_dir_count(struct inode *dir, bool 
*is_empty, size_t *dirs,
      struct INDEX_HDR *hdr;
      const struct ATTR_FILE_NAME *fname;
      u32 e_size, off, end;
-    u64 vbo = 0;
      size_t drs = 0, fles = 0, bit = 0;
-    loff_t i_size = ni->vfs_inode.i_size;
      struct indx_node *node = NULL;
-    u8 index_bits = ni->dir.index_bits;
+    size_t max_indx = ni->vfs_inode.i_size >> ni->dir.index_bits;

      if (is_empty)