Unverified Commit 487f8d48 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

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

fs/ntfs3/attrib.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/ntfs3/frecord.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

fs/ntfs3/fslog.c

+1 −1
Original line number Diff line number Diff line
@@ -2992,7 +2992,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);

fs/ntfs3/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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->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);

fs/ntfs3/ntfs.h

+0 −3
Original line number Diff line number Diff line
@@ -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,