Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs/ntfs3: Improve ntfs_dir_count

Browse Source 
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Konstantin Komarov 2023-11-24 11:24:33 +03:00
parent 22457c047e
commit 6a799c928b
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ntfs3/dir.c
View File

@ -515,11 +515,9 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,
struct INDEX_HDR *hdr; struct INDEX_HDR *hdr;
const struct ATTR_FILE_NAME *fname; const struct ATTR_FILE_NAME *fname;
u32 e_size, off, end; u32 e_size, off, end;
u64 vbo = 0;
size_t drs = 0, fles = 0, bit = 0; size_t drs = 0, fles = 0, bit = 0;
loff_t i_size = ni->vfs_inode.i_size;
struct indx_node *node = NULL; 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) if (is_empty)
*is_empty = true; *is_empty = true;
@ -563,7 +561,7 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,
fles += 1; fles += 1;
} }
if (vbo >= i_size) if (bit >= max_indx)
goto out; goto out;
err = indx_used_bit(&ni->dir, ni, &bit); 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) if (bit == MINUS_ONE_T)
goto out; goto out;
vbo = (u64)bit << index_bits; if (bit >= max_indx)
if (vbo >= i_size)
goto out; goto out;
err = indx_read(&ni->dir, ni, bit << ni->dir.idx2vbn_bits, 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; hdr = &node->index->ihdr;
bit += 1; bit += 1;
vbo = (u64)bit << ni->dir.idx2vbn_bits;
} }
out: out: