fs/ntfs3: Merge synonym COMPRESSION_UNIT and NTFS_LZNT_CUNIT

[ Upstream commit 487f8d482a7e51a640b8f955a398f906a4f83951 ]

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: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Stable-dep-of: 25610ff98d4a ("fs/ntfs3: Fix transform resident to nonresident for compressed files")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c
index 8e6bcdf99770f26b01e5c551bda6664041b859d0..9ccec45190749cea1e186ecd839cd80aa9b5afb0 100644 (file)
--- a/fs/ntfs3/attrib.c
+++ b/fs/ntfs3/attrib.c
@@ -254,7 +254,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,
 
        align = sbi->cluster_size;
        if (is_attr_compressed(attr))
-               align <<= COMPRESSION_UNIT;
+               align <<= NTFS_LZNT_CUNIT;
        len = (rsize + align - 1) >> sbi->cluster_bits;
 
        run_init(run);

diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index 0008670939a4a17929918ca110e56594931022f2..4822cfd6351c27cc75b568043507405331b4d6b1 100644 (file)
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -1501,7 +1501,7 @@ int ni_insert_nonresident(struct ntfs_inode *ni, enum ATTR_TYPE type,
 
        if (is_ext) {
                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;
        }
 

diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 40926bf392d284b24484702e0110e0af8013d11a..e47c2105a24e94411f1984dd2293ea775d421160 100644 (file)
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -2996,7 +2996,7 @@ static struct ATTRIB *attr_create_nonres_log(struct ntfs_sb_info *sbi,
        if (is_ext) {
                attr->name_off = SIZEOF_NONRESIDENT_EX_LE;
                if (is_attr_compressed(attr))
-                       attr->nres.c_unit = COMPRESSION_UNIT;
+                       attr->nres.c_unit = NTFS_LZNT_CUNIT;
 
                attr->nres.run_off =
                        cpu_to_le16(SIZEOF_NONRESIDENT_EX + name_size);

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 0f1664db94ad9ae0116c1613a8312453270ea1f2..8521238f5448efdf7c3209a9d2fb24f28da0cbe2 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -1508,7 +1508,7 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
                        attr->size = cpu_to_le32(SIZEOF_NONRESIDENT_EX + 8);
                        attr->name_off = SIZEOF_NONRESIDENT_EX_LE;
                        attr->flags = ATTR_FLAG_COMPRESSED;
-                       attr->nres.c_unit = COMPRESSION_UNIT;
+                       attr->nres.c_unit = NTFS_LZNT_CUNIT;
                        asize = SIZEOF_NONRESIDENT_EX + 8;
                } else {
                        attr->size = cpu_to_le32(SIZEOF_NONRESIDENT + 8);

diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h
index 3d6143c7abc03f9e113a884ed7506ef4559dabfe..1f2cdb0dbbe1d09f77cbc2112a944562e9d31b4b 100644 (file)
--- a/fs/ntfs3/ntfs.h
+++ b/fs/ntfs3/ntfs.h
@@ -82,9 +82,6 @@ typedef u32 CLST;
 #define RESIDENT_LCN   ((CLST)-2)
 #define COMPRESSED_LCN ((CLST)-3)
 
-#define COMPRESSION_UNIT     4
-#define COMPRESS_MAX_CLUSTER 0x1000
-
 enum RECORD_NUM {
        MFT_REC_MFT             = 0,
        MFT_REC_MIRR            = 1,