ext4: clean up feature test macros with predicate functions (e2b911c5) · Commits · e / devices / android_kernel_sony_msm8998

fs/ext4/balloc.c

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -213,7 +213,7 @@ static int ext4_init_block_bitmap(struct super_block *sb,

	start = ext4_group_first_block_no(sb, block_group);		start = ext4_group_first_block_no(sb, block_group);

	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG))		if (ext4_has_feature_flex_bg(sb))
	flex_bg = 1;		flex_bg = 1;

	/* Set bits for block and inode bitmaps, and inode table */		/* Set bits for block and inode bitmaps, and inode table */
	@@ -322,7 +322,7 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb,
	ext4_fsblk_t blk;		ext4_fsblk_t blk;
	ext4_fsblk_t group_first_block;		ext4_fsblk_t group_first_block;

	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) {		if (ext4_has_feature_flex_bg(sb)) {
	/* with FLEX_BG, the inode/block bitmaps and itable		/* with FLEX_BG, the inode/block bitmaps and itable
	* blocks may not be in the group at all		* blocks may not be in the group at all
	* so the bitmap validation will be skipped for those groups		* so the bitmap validation will be skipped for those groups
	@@ -740,14 +740,13 @@ int ext4_bg_has_super(struct super_block *sb, ext4_group_t group)

	if (group == 0)		if (group == 0)
	return 1;		return 1;
	if (EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_SPARSE_SUPER2)) {		if (ext4_has_feature_sparse_super2(sb)) {
	if (group == le32_to_cpu(es->s_backup_bgs[0]) \|\|		if (group == le32_to_cpu(es->s_backup_bgs[0]) \|\|
	group == le32_to_cpu(es->s_backup_bgs[1]))		group == le32_to_cpu(es->s_backup_bgs[1]))
	return 1;		return 1;
	return 0;		return 0;
	}		}
	if ((group <= 1) \|\| !EXT4_HAS_RO_COMPAT_FEATURE(sb,		if ((group <= 1) \|\| !ext4_has_feature_sparse_super(sb))
	EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER))
	return 1;		return 1;
	if (!(group & 1))		if (!(group & 1))
	return 0;		return 0;
	@@ -776,7 +775,7 @@ static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb,
	if (!ext4_bg_has_super(sb, group))		if (!ext4_bg_has_super(sb, group))
	return 0;		return 0;

	if (EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG))		if (ext4_has_feature_meta_bg(sb))
	return le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);		return le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
	else		else
	return EXT4_SB(sb)->s_gdb_count;		return EXT4_SB(sb)->s_gdb_count;
	@@ -797,8 +796,7 @@ unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group)
	le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);		le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
	unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb);		unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb);

	if (!EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG) \|\|		if (!ext4_has_feature_meta_bg(sb) \|\| metagroup < first_meta_bg)
	metagroup < first_meta_bg)
	return ext4_bg_num_gdb_nometa(sb, group);		return ext4_bg_num_gdb_nometa(sb, group);

	return ext4_bg_num_gdb_meta(sb,group);		return ext4_bg_num_gdb_meta(sb,group);
	@@ -818,7 +816,7 @@ static unsigned ext4_num_base_meta_clusters(struct super_block *sb,
	/* Check for superblock and gdt backups in this group */		/* Check for superblock and gdt backups in this group */
	num = ext4_bg_has_super(sb, block_group);		num = ext4_bg_has_super(sb, block_group);

	if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) \|\|		if (!ext4_has_feature_meta_bg(sb) \|\|
	block_group < le32_to_cpu(sbi->s_es->s_first_meta_bg) *		block_group < le32_to_cpu(sbi->s_es->s_first_meta_bg) *
	sbi->s_desc_per_block) {		sbi->s_desc_per_block) {
	if (num) {		if (num) {

fs/ext4/dir.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,8 +40,7 @@ static int is_dx_dir(struct inode *inode)
	{		{
	struct super_block *sb = inode->i_sb;		struct super_block *sb = inode->i_sb;

	if (EXT4_HAS_COMPAT_FEATURE(inode->i_sb,		if (ext4_has_feature_dir_index(inode->i_sb) &&
	EXT4_FEATURE_COMPAT_DIR_INDEX) &&
	((ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) \|\|		((ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) \|\|
	((inode->i_size >> sb->s_blocksize_bits) == 1) \|\|		((inode->i_size >> sb->s_blocksize_bits) == 1) \|\|
	ext4_has_inline_data(inode)))		ext4_has_inline_data(inode)))

fs/ext4/ext4.h

+132 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1528,6 +1528,7 @@ static inline int ext4_encrypted_inode(struct inode *inode)
	* Feature set definitions		* Feature set definitions
	*/		*/

			/* Use the ext4_{has,set,clear}_feature_* helpers; these will be removed */
	#define EXT4_HAS_COMPAT_FEATURE(sb,mask) \		#define EXT4_HAS_COMPAT_FEATURE(sb,mask) \
	((EXT4_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask)) != 0)		((EXT4_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask)) != 0)
	#define EXT4_HAS_RO_COMPAT_FEATURE(sb,mask) \		#define EXT4_HAS_RO_COMPAT_FEATURE(sb,mask) \
	@@ -1590,6 +1591,94 @@ static inline int ext4_encrypted_inode(struct inode *inode)
	#define EXT4_FEATURE_INCOMPAT_INLINE_DATA 0x8000 /* data in inode */		#define EXT4_FEATURE_INCOMPAT_INLINE_DATA 0x8000 /* data in inode */
	#define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000		#define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000

			#define EXT4_FEATURE_COMPAT_FUNCS(name, flagname) \
			static inline bool ext4_has_feature_##name(struct super_block *sb) \
			{ \
			return ((EXT4_SB(sb)->s_es->s_feature_compat & \
			cpu_to_le32(EXT4_FEATURE_COMPAT_##flagname)) != 0); \
			} \
			static inline void ext4_set_feature_##name(struct super_block *sb) \
			{ \
			EXT4_SB(sb)->s_es->s_feature_compat \|= \
			cpu_to_le32(EXT4_FEATURE_COMPAT_##flagname); \
			} \
			static inline void ext4_clear_feature_##name(struct super_block *sb) \
			{ \
			EXT4_SB(sb)->s_es->s_feature_compat &= \
			~cpu_to_le32(EXT4_FEATURE_COMPAT_##flagname); \
			}

			#define EXT4_FEATURE_RO_COMPAT_FUNCS(name, flagname) \
			static inline bool ext4_has_feature_##name(struct super_block *sb) \
			{ \
			return ((EXT4_SB(sb)->s_es->s_feature_ro_compat & \
			cpu_to_le32(EXT4_FEATURE_RO_COMPAT_##flagname)) != 0); \
			} \
			static inline void ext4_set_feature_##name(struct super_block *sb) \
			{ \
			EXT4_SB(sb)->s_es->s_feature_ro_compat \|= \
			cpu_to_le32(EXT4_FEATURE_RO_COMPAT_##flagname); \
			} \
			static inline void ext4_clear_feature_##name(struct super_block *sb) \
			{ \
			EXT4_SB(sb)->s_es->s_feature_ro_compat &= \
			~cpu_to_le32(EXT4_FEATURE_RO_COMPAT_##flagname); \
			}

			#define EXT4_FEATURE_INCOMPAT_FUNCS(name, flagname) \
			static inline bool ext4_has_feature_##name(struct super_block *sb) \
			{ \
			return ((EXT4_SB(sb)->s_es->s_feature_incompat & \
			cpu_to_le32(EXT4_FEATURE_INCOMPAT_##flagname)) != 0); \
			} \
			static inline void ext4_set_feature_##name(struct super_block *sb) \
			{ \
			EXT4_SB(sb)->s_es->s_feature_incompat \|= \
			cpu_to_le32(EXT4_FEATURE_INCOMPAT_##flagname); \
			} \
			static inline void ext4_clear_feature_##name(struct super_block *sb) \
			{ \
			EXT4_SB(sb)->s_es->s_feature_incompat &= \
			~cpu_to_le32(EXT4_FEATURE_INCOMPAT_##flagname); \
			}

			EXT4_FEATURE_COMPAT_FUNCS(dir_prealloc, DIR_PREALLOC)
			EXT4_FEATURE_COMPAT_FUNCS(imagic_inodes, IMAGIC_INODES)
			EXT4_FEATURE_COMPAT_FUNCS(journal, HAS_JOURNAL)
			EXT4_FEATURE_COMPAT_FUNCS(xattr, EXT_ATTR)
			EXT4_FEATURE_COMPAT_FUNCS(resize_inode, RESIZE_INODE)
			EXT4_FEATURE_COMPAT_FUNCS(dir_index, DIR_INDEX)
			EXT4_FEATURE_COMPAT_FUNCS(sparse_super2, SPARSE_SUPER2)

			EXT4_FEATURE_RO_COMPAT_FUNCS(sparse_super, SPARSE_SUPER)
			EXT4_FEATURE_RO_COMPAT_FUNCS(large_file, LARGE_FILE)
			EXT4_FEATURE_RO_COMPAT_FUNCS(btree_dir, BTREE_DIR)
			EXT4_FEATURE_RO_COMPAT_FUNCS(huge_file, HUGE_FILE)
			EXT4_FEATURE_RO_COMPAT_FUNCS(gdt_csum, GDT_CSUM)
			EXT4_FEATURE_RO_COMPAT_FUNCS(dir_nlink, DIR_NLINK)
			EXT4_FEATURE_RO_COMPAT_FUNCS(extra_isize, EXTRA_ISIZE)
			EXT4_FEATURE_RO_COMPAT_FUNCS(quota, QUOTA)
			EXT4_FEATURE_RO_COMPAT_FUNCS(bigalloc, BIGALLOC)
			EXT4_FEATURE_RO_COMPAT_FUNCS(metadata_csum, METADATA_CSUM)
			EXT4_FEATURE_RO_COMPAT_FUNCS(readonly, READONLY)
			EXT4_FEATURE_RO_COMPAT_FUNCS(project, PROJECT)

			EXT4_FEATURE_INCOMPAT_FUNCS(compression, COMPRESSION)
			EXT4_FEATURE_INCOMPAT_FUNCS(filetype, FILETYPE)
			EXT4_FEATURE_INCOMPAT_FUNCS(journal_needs_recovery, RECOVER)
			EXT4_FEATURE_INCOMPAT_FUNCS(journal_dev, JOURNAL_DEV)
			EXT4_FEATURE_INCOMPAT_FUNCS(meta_bg, META_BG)
			EXT4_FEATURE_INCOMPAT_FUNCS(extents, EXTENTS)
			EXT4_FEATURE_INCOMPAT_FUNCS(64bit, 64BIT)
			EXT4_FEATURE_INCOMPAT_FUNCS(mmp, MMP)
			EXT4_FEATURE_INCOMPAT_FUNCS(flex_bg, FLEX_BG)
			EXT4_FEATURE_INCOMPAT_FUNCS(ea_inode, EA_INODE)
			EXT4_FEATURE_INCOMPAT_FUNCS(dirdata, DIRDATA)
			EXT4_FEATURE_INCOMPAT_FUNCS(csum_seed, CSUM_SEED)
			EXT4_FEATURE_INCOMPAT_FUNCS(largedir, LARGEDIR)
			EXT4_FEATURE_INCOMPAT_FUNCS(inline_data, INLINE_DATA)
			EXT4_FEATURE_INCOMPAT_FUNCS(encrypt, ENCRYPT)

	#define EXT2_FEATURE_COMPAT_SUPP EXT4_FEATURE_COMPAT_EXT_ATTR		#define EXT2_FEATURE_COMPAT_SUPP EXT4_FEATURE_COMPAT_EXT_ATTR
	#define EXT2_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE\| \		#define EXT2_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE\| \
	EXT4_FEATURE_INCOMPAT_META_BG)		EXT4_FEATURE_INCOMPAT_META_BG)
	@@ -1605,7 +1694,7 @@ static inline int ext4_encrypted_inode(struct inode *inode)
	EXT4_FEATURE_RO_COMPAT_LARGE_FILE\| \		EXT4_FEATURE_RO_COMPAT_LARGE_FILE\| \
	EXT4_FEATURE_RO_COMPAT_BTREE_DIR)		EXT4_FEATURE_RO_COMPAT_BTREE_DIR)

	#define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR		#define EXT4_FEATURE_COMPAT_SUPP EXT4_FEATURE_COMPAT_EXT_ATTR
	#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE\| \		#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE\| \
	EXT4_FEATURE_INCOMPAT_RECOVER\| \		EXT4_FEATURE_INCOMPAT_RECOVER\| \
	EXT4_FEATURE_INCOMPAT_META_BG\| \		EXT4_FEATURE_INCOMPAT_META_BG\| \
	@@ -1627,6 +1716,40 @@ static inline int ext4_encrypted_inode(struct inode *inode)
	EXT4_FEATURE_RO_COMPAT_METADATA_CSUM\|\		EXT4_FEATURE_RO_COMPAT_METADATA_CSUM\|\
	EXT4_FEATURE_RO_COMPAT_QUOTA)		EXT4_FEATURE_RO_COMPAT_QUOTA)

			#define EXTN_FEATURE_FUNCS(ver) \
			static inline bool ext4_has_unknown_ext##ver##_compat_features(struct super_block *sb) \
			{ \
			return ((EXT4_SB(sb)->s_es->s_feature_compat & \
			cpu_to_le32(~EXT##ver##_FEATURE_COMPAT_SUPP)) != 0); \
			} \
			static inline bool ext4_has_unknown_ext##ver##_ro_compat_features(struct super_block *sb) \
			{ \
			return ((EXT4_SB(sb)->s_es->s_feature_ro_compat & \
			cpu_to_le32(~EXT##ver##_FEATURE_RO_COMPAT_SUPP)) != 0); \
			} \
			static inline bool ext4_has_unknown_ext##ver##_incompat_features(struct super_block *sb) \
			{ \
			return ((EXT4_SB(sb)->s_es->s_feature_incompat & \
			cpu_to_le32(~EXT##ver##_FEATURE_INCOMPAT_SUPP)) != 0); \
			}

			EXTN_FEATURE_FUNCS(2)
			EXTN_FEATURE_FUNCS(3)
			EXTN_FEATURE_FUNCS(4)

			static inline bool ext4_has_compat_features(struct super_block *sb)
			{
			return (EXT4_SB(sb)->s_es->s_feature_compat != 0);
			}
			static inline bool ext4_has_ro_compat_features(struct super_block *sb)
			{
			return (EXT4_SB(sb)->s_es->s_feature_ro_compat != 0);
			}
			static inline bool ext4_has_incompat_features(struct super_block *sb)
			{
			return (EXT4_SB(sb)->s_es->s_feature_incompat != 0);
			}

	/*		/*
	* Default values for user and/or group using reserved blocks		* Default values for user and/or group using reserved blocks
	*/		*/
	@@ -1777,8 +1900,7 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize)
	* (c) Daniel Phillips, 2001		* (c) Daniel Phillips, 2001
	*/		*/

	#define is_dx(dir) (EXT4_HAS_COMPAT_FEATURE(dir->i_sb, \		#define is_dx(dir) (ext4_has_feature_dir_index((dir)->i_sb) && \
	EXT4_FEATURE_COMPAT_DIR_INDEX) && \
	ext4_test_inode_flag((dir), EXT4_INODE_INDEX))		ext4_test_inode_flag((dir), EXT4_INODE_INDEX))
	#define EXT4_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT4_LINK_MAX)		#define EXT4_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT4_LINK_MAX)
	#define EXT4_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 \|\| (dir)->i_nlink == 1)		#define EXT4_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 \|\| (dir)->i_nlink == 1)
	@@ -2079,7 +2201,7 @@ int ext4_init_crypto(void);
	void ext4_exit_crypto(void);		void ext4_exit_crypto(void);
	static inline int ext4_sb_has_crypto(struct super_block *sb)		static inline int ext4_sb_has_crypto(struct super_block *sb)
	{		{
	return EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_ENCRYPT);		return ext4_has_feature_encrypt(sb);
	}		}
	#else		#else
	static inline int ext4_init_crypto(void) { return 0; }		static inline int ext4_init_crypto(void) { return 0; }
	@@ -2200,8 +2322,7 @@ int ext4_insert_dentry(struct inode *dir,
	struct ext4_filename *fname);		struct ext4_filename *fname);
	static inline void ext4_update_dx_flag(struct inode *inode)		static inline void ext4_update_dx_flag(struct inode *inode)
	{		{
	if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb,		if (!ext4_has_feature_dir_index(inode->i_sb))
	EXT4_FEATURE_COMPAT_DIR_INDEX))
	ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);		ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);
	}		}
	static unsigned char ext4_filetype_table[] = {		static unsigned char ext4_filetype_table[] = {
	@@ -2210,8 +2331,7 @@ static unsigned char ext4_filetype_table[] = {

	static inline unsigned char get_dtype(struct super_block *sb, int filetype)		static inline unsigned char get_dtype(struct super_block *sb, int filetype)
	{		{
	if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE) \|\|		if (!ext4_has_feature_filetype(sb) \|\| filetype >= EXT4_FT_MAX)
	(filetype >= EXT4_FT_MAX))
	return DT_UNKNOWN;		return DT_UNKNOWN;

	return ext4_filetype_table[filetype];		return ext4_filetype_table[filetype];
	@@ -2543,15 +2663,13 @@ extern int ext4_register_li_request(struct super_block *sb,

	static inline int ext4_has_group_desc_csum(struct super_block *sb)		static inline int ext4_has_group_desc_csum(struct super_block *sb)
	{		{
	return EXT4_HAS_RO_COMPAT_FEATURE(sb,		return ext4_has_feature_gdt_csum(sb) \|\|
	EXT4_FEATURE_RO_COMPAT_GDT_CSUM) \|\|		EXT4_SB(sb)->s_chksum_driver != NULL;
	(EXT4_SB(sb)->s_chksum_driver != NULL);
	}		}

	static inline int ext4_has_metadata_csum(struct super_block *sb)		static inline int ext4_has_metadata_csum(struct super_block *sb)
	{		{
	WARN_ON_ONCE(EXT4_HAS_RO_COMPAT_FEATURE(sb,		WARN_ON_ONCE(ext4_has_feature_metadata_csum(sb) &&
	EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&
	!EXT4_SB(sb)->s_chksum_driver);		!EXT4_SB(sb)->s_chksum_driver);

	return (EXT4_SB(sb)->s_chksum_driver != NULL);		return (EXT4_SB(sb)->s_chksum_driver != NULL);
	@@ -2898,7 +3016,7 @@ static unsigned char ext4_type_by_mode[S_IFMT >> S_SHIFT] = {
	static inline void ext4_set_de_type(struct super_block *sb,		static inline void ext4_set_de_type(struct super_block *sb,
	struct ext4_dir_entry_2 *de,		struct ext4_dir_entry_2 *de,
	umode_t mode) {		umode_t mode) {
	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE))		if (ext4_has_feature_filetype(sb))
	de->file_type = ext4_type_by_mode[(mode & S_IFMT)>>S_SHIFT];		de->file_type = ext4_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
	}		}

fs/ext4/ext4_jbd2.h

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -34,8 +34,7 @@
	*/		*/

	#define EXT4_SINGLEDATA_TRANS_BLOCKS(sb) \		#define EXT4_SINGLEDATA_TRANS_BLOCKS(sb) \
	(EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS) \		(ext4_has_feature_extents(sb) ? 20U : 8U)
	? 20U : 8U)

	/* Extended attribute operations touch at most two data buffers,		/* Extended attribute operations touch at most two data buffers,
	* two bitmap buffers, and two group summaries, in addition to the inode		* two bitmap buffers, and two group summaries, in addition to the inode
	@@ -84,17 +83,16 @@
	/* Amount of blocks needed for quota update - we know that the structure was		/* Amount of blocks needed for quota update - we know that the structure was
	* allocated so we need to update only data block */		* allocated so we need to update only data block */
	#define EXT4_QUOTA_TRANS_BLOCKS(sb) ((test_opt(sb, QUOTA) \|\|\		#define EXT4_QUOTA_TRANS_BLOCKS(sb) ((test_opt(sb, QUOTA) \|\|\
	EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)) ?\		ext4_has_feature_quota(sb)) ? 1 : 0)
	1 : 0)
	/* Amount of blocks needed for quota insert/delete - we do some block writes		/* Amount of blocks needed for quota insert/delete - we do some block writes
	* but inode, sb and group updates are done only once */		* but inode, sb and group updates are done only once */
	#define EXT4_QUOTA_INIT_BLOCKS(sb) ((test_opt(sb, QUOTA) \|\|\		#define EXT4_QUOTA_INIT_BLOCKS(sb) ((test_opt(sb, QUOTA) \|\|\
	EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)) ?\		ext4_has_feature_quota(sb)) ?\
	(DQUOT_INIT_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\		(DQUOT_INIT_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\
	+3+DQUOT_INIT_REWRITE) : 0)		+3+DQUOT_INIT_REWRITE) : 0)

	#define EXT4_QUOTA_DEL_BLOCKS(sb) ((test_opt(sb, QUOTA) \|\|\		#define EXT4_QUOTA_DEL_BLOCKS(sb) ((test_opt(sb, QUOTA) \|\|\
	EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)) ?\		ext4_has_feature_quota(sb)) ?\
	(DQUOT_DEL_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\		(DQUOT_DEL_ALLOC*(EXT4_SINGLEDATA_TRANS_BLOCKS(sb)-3)\
	+3+DQUOT_DEL_REWRITE) : 0)		+3+DQUOT_DEL_REWRITE) : 0)
	#else		#else

fs/ext4/extents.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3055,7 +3055,7 @@ void ext4_ext_init(struct super_block *sb)
	* possible initialization would be here		* possible initialization would be here
	*/		*/

	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) {		if (ext4_has_feature_extents(sb)) {
	#if defined(AGGRESSIVE_TEST) \|\| defined(CHECK_BINSEARCH) \|\| defined(EXTENTS_STATS)		#if defined(AGGRESSIVE_TEST) \|\| defined(CHECK_BINSEARCH) \|\| defined(EXTENTS_STATS)
	printk(KERN_INFO "EXT4-fs: file extents enabled"		printk(KERN_INFO "EXT4-fs: file extents enabled"
	#ifdef AGGRESSIVE_TEST		#ifdef AGGRESSIVE_TEST
	@@ -3082,7 +3082,7 @@ void ext4_ext_init(struct super_block *sb)
	*/		*/
	void ext4_ext_release(struct super_block *sb)		void ext4_ext_release(struct super_block *sb)
	{		{
	if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS))		if (!ext4_has_feature_extents(sb))
	return;		return;

	#ifdef EXTENTS_STATS		#ifdef EXTENTS_STATS