Skip to content

Commit e224fa3

Browse files
ebiggerstytso
ebiggers
authored and
tytso
committed
ext4: remove redundant function ext4_has_metadata_csum
Since commit f2b4fa1 ("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: Eric Biggers <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent a662f3c commit e224fa3

File tree

15 files changed

+57
-56
lines changed

15 files changed

+57
-56
lines changed

‎fs/ext4/bitmap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb,
2525
struct ext4_sb_info *sbi = EXT4_SB(sb);
2626
int sz;
2727

28-
if (!ext4_has_metadata_csum(sb))
28+
if (!ext4_has_feature_metadata_csum(sb))
2929
return 1;
3030

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

51-
if (!ext4_has_metadata_csum(sb))
51+
if (!ext4_has_feature_metadata_csum(sb))
5252
return;
5353

5454
sz = EXT4_INODES_PER_GROUP(sb) >> 3;
@@ -67,7 +67,7 @@ int ext4_block_bitmap_csum_verify(struct super_block *sb,
6767
struct ext4_sb_info *sbi = EXT4_SB(sb);
6868
int sz = EXT4_CLUSTERS_PER_GROUP(sb) / 8;
6969

70-
if (!ext4_has_metadata_csum(sb))
70+
if (!ext4_has_feature_metadata_csum(sb))
7171
return 1;
7272

7373
provided = le16_to_cpu(gdp->bg_block_bitmap_csum_lo);
@@ -89,7 +89,7 @@ void ext4_block_bitmap_csum_set(struct super_block *sb,
8989
__u32 csum;
9090
struct ext4_sb_info *sbi = EXT4_SB(sb);
9191

92-
if (!ext4_has_metadata_csum(sb))
92+
if (!ext4_has_feature_metadata_csum(sb))
9393
return;
9494

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

‎fs/ext4/dir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,
8686
dir->i_sb->s_blocksize);
8787
const int next_offset = ((char *) de - buf) + rlen;
8888
bool fake = is_fake_dir_entry(de);
89-
bool has_csum = ext4_has_metadata_csum(dir->i_sb);
89+
bool has_csum = ext4_has_feature_metadata_csum(dir->i_sb);
9090

9191
if (unlikely(rlen < ext4_dir_rec_len(1, fake ? NULL : dir)))
9292
error_msg = "rec_len is smaller than minimal";
@@ -145,7 +145,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
145145
return err;
146146

147147
/* Can we just clear INDEX flag to ignore htree information? */
148-
if (!ext4_has_metadata_csum(sb)) {
148+
if (!ext4_has_feature_metadata_csum(sb)) {
149149
/*
150150
* We don't set the inode dirty flag since it's not
151151
* critical that it gets flushed back to the disk.

‎fs/ext4/ext4.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3280,14 +3280,10 @@ extern void ext4_group_desc_csum_set(struct super_block *sb, __u32 group,
32803280
extern int ext4_register_li_request(struct super_block *sb,
32813281
ext4_group_t first_not_zeroed);
32823282

3283-
static inline int ext4_has_metadata_csum(struct super_block *sb)
3284-
{
3285-
return ext4_has_feature_metadata_csum(sb);
3286-
}
3287-
32883283
static inline int ext4_has_group_desc_csum(struct super_block *sb)
32893284
{
3290-
return ext4_has_feature_gdt_csum(sb) || ext4_has_metadata_csum(sb);
3285+
return ext4_has_feature_gdt_csum(sb) ||
3286+
ext4_has_feature_metadata_csum(sb);
32913287
}
32923288

32933289
#define ext4_read_incompat_64bit_val(es, name) \

‎fs/ext4/ext4_jbd2.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line,
246246
}
247247
} else
248248
ext4_check_bdev_write_error(sb);
249-
if (trigger_type == EXT4_JTR_NONE || !ext4_has_metadata_csum(sb))
249+
if (trigger_type == EXT4_JTR_NONE ||
250+
!ext4_has_feature_metadata_csum(sb))
250251
return 0;
251252
BUG_ON(trigger_type >= EXT4_JOURNAL_TRIGGER_COUNT);
252253
jbd2_journal_set_triggers(bh,
@@ -333,7 +334,8 @@ int __ext4_journal_get_create_access(const char *where, unsigned int line,
333334
err);
334335
return err;
335336
}
336-
if (trigger_type == EXT4_JTR_NONE || !ext4_has_metadata_csum(sb))
337+
if (trigger_type == EXT4_JTR_NONE ||
338+
!ext4_has_feature_metadata_csum(sb))
337339
return 0;
338340
BUG_ON(trigger_type >= EXT4_JOURNAL_TRIGGER_COUNT);
339341
jbd2_journal_set_triggers(bh,

‎fs/ext4/extents.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static int ext4_extent_block_csum_verify(struct inode *inode,
6363
{
6464
struct ext4_extent_tail *et;
6565

66-
if (!ext4_has_metadata_csum(inode->i_sb))
66+
if (!ext4_has_feature_metadata_csum(inode->i_sb))
6767
return 1;
6868

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

80-
if (!ext4_has_metadata_csum(inode->i_sb))
80+
if (!ext4_has_feature_metadata_csum(inode->i_sb))
8181
return;
8282

8383
et = find_ext4_extent_tail(eh);

‎fs/ext4/ialloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ struct inode *__ext4_new_inode(struct mnt_idmap *idmap,
12831283
inode->i_generation = get_random_u32();
12841284

12851285
/* Precompute checksum seed for inode metadata */
1286-
if (ext4_has_metadata_csum(sb)) {
1286+
if (ext4_has_feature_metadata_csum(sb)) {
12871287
__u32 csum;
12881288
__le32 inum = cpu_to_le32(inode->i_ino);
12891289
__le32 gen = cpu_to_le32(inode->i_generation);

‎fs/ext4/inline.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ static int ext4_finish_convert_inline_dir(handle_t *handle,
10811081
memcpy((void *)de, buf + EXT4_INLINE_DOTDOT_SIZE,
10821082
inline_size - EXT4_INLINE_DOTDOT_SIZE);
10831083

1084-
if (ext4_has_metadata_csum(inode->i_sb))
1084+
if (ext4_has_feature_metadata_csum(inode->i_sb))
10851085
csum_size = sizeof(struct ext4_dir_entry_tail);
10861086

10871087
inode->i_size = inode->i_sb->s_blocksize;

‎fs/ext4/inode.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static int ext4_inode_csum_verify(struct inode *inode, struct ext4_inode *raw,
9494

9595
if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
9696
cpu_to_le32(EXT4_OS_LINUX) ||
97-
!ext4_has_metadata_csum(inode->i_sb))
97+
!ext4_has_feature_metadata_csum(inode->i_sb))
9898
return 1;
9999

100100
provided = le16_to_cpu(raw->i_checksum_lo);
@@ -115,7 +115,7 @@ void ext4_inode_csum_set(struct inode *inode, struct ext4_inode *raw,
115115

116116
if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
117117
cpu_to_le32(EXT4_OS_LINUX) ||
118-
!ext4_has_metadata_csum(inode->i_sb))
118+
!ext4_has_feature_metadata_csum(inode->i_sb))
119119
return;
120120

121121
csum = ext4_inode_csum(inode, raw, ei);
@@ -4822,7 +4822,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
48224822
ei->i_extra_isize = 0;
48234823

48244824
/* Precompute checksum seed for inode metadata */
4825-
if (ext4_has_metadata_csum(sb)) {
4825+
if (ext4_has_feature_metadata_csum(sb)) {
48264826
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
48274827
__u32 csum;
48284828
__le32 inum = cpu_to_le32(inode->i_ino);
@@ -4909,7 +4909,8 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
49094909
* we'd normally treat htree data as empty space. But with metadata
49104910
* checksumming that corrupts checksums so forbid that.
49114911
*/
4912-
if (!ext4_has_feature_dir_index(sb) && ext4_has_metadata_csum(sb) &&
4912+
if (!ext4_has_feature_dir_index(sb) &&
4913+
ext4_has_feature_metadata_csum(sb) &&
49134914
ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) {
49144915
ext4_error_inode(inode, function, line, 0,
49154916
"iget: Dir with htree data on filesystem without dir_index feature.");

‎fs/ext4/ioctl.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ static int ext4_update_backup_sb(struct super_block *sb,
142142

143143
es = (struct ext4_super_block *) (bh->b_data + offset);
144144
lock_buffer(bh);
145-
if (ext4_has_metadata_csum(sb) &&
145+
if (ext4_has_feature_metadata_csum(sb) &&
146146
es->s_checksum != ext4_superblock_csum(sb, es)) {
147147
ext4_msg(sb, KERN_ERR, "Invalid checksum for backup "
148148
"superblock %llu", sb_block);
149149
unlock_buffer(bh);
150150
goto out_bh;
151151
}
152152
func(es, arg);
153-
if (ext4_has_metadata_csum(sb))
153+
if (ext4_has_feature_metadata_csum(sb))
154154
es->s_checksum = ext4_superblock_csum(sb, es);
155155
set_buffer_uptodate(bh);
156156
unlock_buffer(bh);
@@ -351,7 +351,7 @@ void ext4_reset_inode_seed(struct inode *inode)
351351
__le32 gen = cpu_to_le32(inode->i_generation);
352352
__u32 csum;
353353

354-
if (!ext4_has_metadata_csum(inode->i_sb))
354+
if (!ext4_has_feature_metadata_csum(inode->i_sb))
355355
return;
356356

357357
csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum, sizeof(inum));
@@ -1205,7 +1205,8 @@ static int ext4_ioctl_setuuid(struct file *filp,
12051205
* If any checksums (group descriptors or metadata) are being used
12061206
* then the checksum seed feature is required to change the UUID.
12071207
*/
1208-
if (((ext4_has_feature_gdt_csum(sb) || ext4_has_metadata_csum(sb))
1208+
if (((ext4_has_feature_gdt_csum(sb) ||
1209+
ext4_has_feature_metadata_csum(sb))
12091210
&& !ext4_has_feature_csum_seed(sb))
12101211
|| ext4_has_feature_stable_inodes(sb))
12111212
return -EOPNOTSUPP;
@@ -1253,7 +1254,7 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
12531254
if (!inode_owner_or_capable(idmap, inode))
12541255
return -EPERM;
12551256

1256-
if (ext4_has_metadata_csum(inode->i_sb)) {
1257+
if (ext4_has_feature_metadata_csum(inode->i_sb)) {
12571258
ext4_warning(sb, "Setting inode version is not "
12581259
"supported with metadata_csum enabled.");
12591260
return -ENOTTY;

‎fs/ext4/mmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ static __le32 ext4_mmp_csum(struct super_block *sb, struct mmp_struct *mmp)
2121

2222
static int ext4_mmp_csum_verify(struct super_block *sb, struct mmp_struct *mmp)
2323
{
24-
if (!ext4_has_metadata_csum(sb))
24+
if (!ext4_has_feature_metadata_csum(sb))
2525
return 1;
2626

2727
return mmp->mmp_checksum == ext4_mmp_csum(sb, mmp);
2828
}
2929

3030
static void ext4_mmp_csum_set(struct super_block *sb, struct mmp_struct *mmp)
3131
{
32-
if (!ext4_has_metadata_csum(sb))
32+
if (!ext4_has_feature_metadata_csum(sb))
3333
return;
3434

3535
mmp->mmp_checksum = ext4_mmp_csum(sb, mmp);

0 commit comments

Comments
 (0)