Commit e224fa3b authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

ext4: remove redundant function ext4_has_metadata_csum 



Since commit f2b4fa19 ("ext4: switch to using the crc32c library"),
ext4_has_metadata_csum() is just an alias for
ext4_has_feature_metadata_csum().  ext4_has_feature_metadata_csum() is
generated by EXT4_FEATURE_RO_COMPAT_FUNCS and uses the regular naming
convention for checking a single ext4 feature.  Therefore, remove
ext4_has_metadata_csum() and update all its callers to use
ext4_has_feature_metadata_csum() directly.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Link: https://patch.msgid.link/20250207031335.42637-1-ebiggers@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent a662f3c0

fs/ext4/bitmap.c

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	int sz;



	if (!ext4_has_metadata_csum(sb))

	if (!ext4_has_feature_metadata_csum(sb))

		return 1;



	sz = EXT4_INODES_PER_GROUP(sb) >> 3;
@@ -48,7 +48,7 @@ void ext4_inode_bitmap_csum_set(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	int sz;



	if (!ext4_has_metadata_csum(sb))

	if (!ext4_has_feature_metadata_csum(sb))

		return;



	sz = EXT4_INODES_PER_GROUP(sb) >> 3;
@@ -67,7 +67,7 @@ int ext4_block_bitmap_csum_verify(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	int sz = EXT4_CLUSTERS_PER_GROUP(sb) / 8;



	if (!ext4_has_metadata_csum(sb))

	if (!ext4_has_feature_metadata_csum(sb))

		return 1;



	provided = le16_to_cpu(gdp->bg_block_bitmap_csum_lo);
@@ -89,7 +89,7 @@ void ext4_block_bitmap_csum_set(struct super_block *sb, 
	__u32 csum;

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	if (!ext4_has_metadata_csum(sb))

	if (!ext4_has_feature_metadata_csum(sb))

		return;



	csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);

fs/ext4/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int __ext4_check_dir_entry(const char *function, unsigned int line, 
						dir->i_sb->s_blocksize);

	const int next_offset = ((char *) de - buf) + rlen;

	bool fake = is_fake_dir_entry(de);

	bool has_csum = ext4_has_metadata_csum(dir->i_sb);

	bool has_csum = ext4_has_feature_metadata_csum(dir->i_sb);



	if (unlikely(rlen < ext4_dir_rec_len(1, fake ? NULL : dir)))

		error_msg = "rec_len is smaller than minimal";
@@ -145,7 +145,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) 
			return err;



		/* Can we just clear INDEX flag to ignore htree information? */

		if (!ext4_has_metadata_csum(sb)) {

		if (!ext4_has_feature_metadata_csum(sb)) {

			/*

			 * We don't set the inode dirty flag since it's not

			 * critical that it gets flushed back to the disk.

fs/ext4/ext4.h

+2 −6
Original line number Diff line number Diff line
@@ -3280,14 +3280,10 @@ extern void ext4_group_desc_csum_set(struct super_block *sb, __u32 group, 
extern int ext4_register_li_request(struct super_block *sb,

				    ext4_group_t first_not_zeroed);



static inline int ext4_has_metadata_csum(struct super_block *sb)

{

	return ext4_has_feature_metadata_csum(sb);

}



static inline int ext4_has_group_desc_csum(struct super_block *sb)

{

	return ext4_has_feature_gdt_csum(sb) || ext4_has_metadata_csum(sb);

	return ext4_has_feature_gdt_csum(sb) ||

	       ext4_has_feature_metadata_csum(sb);

}



#define ext4_read_incompat_64bit_val(es, name) \

fs/ext4/ext4_jbd2.c

+4 −2
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line, 
		}

	} else

		ext4_check_bdev_write_error(sb);

	if (trigger_type == EXT4_JTR_NONE || !ext4_has_metadata_csum(sb))

	if (trigger_type == EXT4_JTR_NONE ||

	    !ext4_has_feature_metadata_csum(sb))

		return 0;

	BUG_ON(trigger_type >= EXT4_JOURNAL_TRIGGER_COUNT);

	jbd2_journal_set_triggers(bh,
@@ -333,7 +334,8 @@ int __ext4_journal_get_create_access(const char *where, unsigned int line, 
					  err);

		return err;

	}

	if (trigger_type == EXT4_JTR_NONE || !ext4_has_metadata_csum(sb))

	if (trigger_type == EXT4_JTR_NONE ||

	    !ext4_has_feature_metadata_csum(sb))

		return 0;

	BUG_ON(trigger_type >= EXT4_JOURNAL_TRIGGER_COUNT);

	jbd2_journal_set_triggers(bh,

fs/ext4/extents.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int ext4_extent_block_csum_verify(struct inode *inode, 
{

	struct ext4_extent_tail *et;



	if (!ext4_has_metadata_csum(inode->i_sb))

	if (!ext4_has_feature_metadata_csum(inode->i_sb))

		return 1;



	et = find_ext4_extent_tail(eh);
@@ -77,7 +77,7 @@ static void ext4_extent_block_csum_set(struct inode *inode, 
{

	struct ext4_extent_tail *et;



	if (!ext4_has_metadata_csum(inode->i_sb))

	if (!ext4_has_feature_metadata_csum(inode->i_sb))

		return;



	et = find_ext4_extent_tail(eh);