bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs/ntfs3: Fix transform resident to nonresident for compressed files

Browse source 
[ Upstream commit 25610ff98d4a34e6a85cbe4fd8671be6b0829f8f ]

Сorrected calculation of required space len (in clusters)
for attribute data storage in case of compression.

Fixes: be71b5cba2 ("fs/ntfs3: Add attrib operations")
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Konstantin Komarov 2024-05-16 01:10:01 +03:00 • committed by Greg Kroah-Hartman
parent f37b756a23
commit c4df2d4821
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fs/ntfs3/attrib.c
View file

@ -231,7 +231,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,
struct ntfs_sb_info *sbi; struct ntfs_sb_info *sbi;
struct ATTRIB *attr_s; struct ATTRIB *attr_s;
struct MFT_REC *rec; struct MFT_REC *rec;
u32 used, asize, rsize, aoff, align; u32 used, asize, rsize, aoff;
bool is_data; bool is_data;
CLST len, alen; CLST len, alen;
char *next; char *next;
@ -252,10 +252,13 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,
rsize = le32_to_cpu(attr->res.data_size); rsize = le32_to_cpu(attr->res.data_size);
is_data = attr->type == ATTR_DATA && !attr->name_len; is_data = attr->type == ATTR_DATA && !attr->name_len;
align = sbi->cluster_size; /* len - how many clusters required to store 'rsize' bytes */
if (is_attr_compressed(attr)) if (is_attr_compressed(attr)) {
align <<= NTFS_LZNT_CUNIT; u8 shift = sbi->cluster_bits + NTFS_LZNT_CUNIT;
len = (rsize + align - 1) >> sbi->cluster_bits; len = ((rsize + (1u << shift) - 1) >> shift) << NTFS_LZNT_CUNIT;
} else {
len = bytes_to_cluster(sbi, rsize);
}
run_init(run); run_init(run);