Commit 487f8d48 authored by Konstantin Komarov's avatar Konstantin Komarov

fs/ntfs3: Merge synonym COMPRESSION_UNIT and NTFS_LZNT_CUNIT

COMPRESSION_UNIT and NTFS_LZNT_CUNIT mean the same thing
(1u<<NTFS_LZNT_CUNIT) determines the size for compression (in clusters).

COMPRESS_MAX_CLUSTER is not used in the code.
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 34abb4f6
...@@ -254,7 +254,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr, ...@@ -254,7 +254,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,
align = sbi->cluster_size; align = sbi->cluster_size;
if (is_attr_compressed(attr)) if (is_attr_compressed(attr))
align <<= COMPRESSION_UNIT; align <<= NTFS_LZNT_CUNIT;
len = (rsize + align - 1) >> sbi->cluster_bits; len = (rsize + align - 1) >> sbi->cluster_bits;
run_init(run); run_init(run);
......
...@@ -1501,7 +1501,7 @@ int ni_insert_nonresident(struct ntfs_inode *ni, enum ATTR_TYPE type, ...@@ -1501,7 +1501,7 @@ int ni_insert_nonresident(struct ntfs_inode *ni, enum ATTR_TYPE type,
if (is_ext) { if (is_ext) {
if (flags & ATTR_FLAG_COMPRESSED) if (flags & ATTR_FLAG_COMPRESSED)
attr->nres.c_unit = COMPRESSION_UNIT; attr->nres.c_unit = NTFS_LZNT_CUNIT;
attr->nres.total_size = attr->nres.alloc_size; attr->nres.total_size = attr->nres.alloc_size;
} }
......
...@@ -2992,7 +2992,7 @@ static struct ATTRIB *attr_create_nonres_log(struct ntfs_sb_info *sbi, ...@@ -2992,7 +2992,7 @@ static struct ATTRIB *attr_create_nonres_log(struct ntfs_sb_info *sbi,
if (is_ext) { if (is_ext) {
attr->name_off = SIZEOF_NONRESIDENT_EX_LE; attr->name_off = SIZEOF_NONRESIDENT_EX_LE;
if (is_attr_compressed(attr)) if (is_attr_compressed(attr))
attr->nres.c_unit = COMPRESSION_UNIT; attr->nres.c_unit = NTFS_LZNT_CUNIT;
attr->nres.run_off = attr->nres.run_off =
cpu_to_le16(SIZEOF_NONRESIDENT_EX + name_size); cpu_to_le16(SIZEOF_NONRESIDENT_EX + name_size);
......
...@@ -1478,7 +1478,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir, ...@@ -1478,7 +1478,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
attr->size = cpu_to_le32(SIZEOF_NONRESIDENT_EX + 8); attr->size = cpu_to_le32(SIZEOF_NONRESIDENT_EX + 8);
attr->name_off = SIZEOF_NONRESIDENT_EX_LE; attr->name_off = SIZEOF_NONRESIDENT_EX_LE;
attr->flags = ATTR_FLAG_COMPRESSED; attr->flags = ATTR_FLAG_COMPRESSED;
attr->nres.c_unit = COMPRESSION_UNIT; attr->nres.c_unit = NTFS_LZNT_CUNIT;
asize = SIZEOF_NONRESIDENT_EX + 8; asize = SIZEOF_NONRESIDENT_EX + 8;
} else { } else {
attr->size = cpu_to_le32(SIZEOF_NONRESIDENT + 8); attr->size = cpu_to_le32(SIZEOF_NONRESIDENT + 8);
......
...@@ -82,9 +82,6 @@ typedef u32 CLST; ...@@ -82,9 +82,6 @@ typedef u32 CLST;
#define RESIDENT_LCN ((CLST)-2) #define RESIDENT_LCN ((CLST)-2)
#define COMPRESSED_LCN ((CLST)-3) #define COMPRESSED_LCN ((CLST)-3)
#define COMPRESSION_UNIT 4
#define COMPRESS_MAX_CLUSTER 0x1000
enum RECORD_NUM { enum RECORD_NUM {
MFT_REC_MFT = 0, MFT_REC_MFT = 0,
MFT_REC_MIRR = 1, MFT_REC_MIRR = 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment