ext4: remove redundant function ext4_has_metadata_csum

Since commit f2b4fa19647e ("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 <ebiggers@google.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://patch.msgid.link/20250207031335.42637-1-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c
index 2a135075468d359bd148bfa9d73ab392c41794e0..a4dbaccee6e7b8f73f536c2a3fb2cc2af814eada 100644 (file)
--- a/fs/ext4/bitmap.c
+++ b/fs/ext4/bitmap.c
@@ -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);

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 02d47a64e8d13b56da1a444f332d7be438a57d35..d671b2c9eba2f94ada1b51e8c60c030fd2358d86 100644 (file)
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -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.

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 5179a7a04f2c66fed9526441b7de753d2be10967..96dc30c9388efebb954783d5350d9add001f74a2 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -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) \

diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index 4e3bd4910f489a1ea63d48ff75fa74e0d708b948..135e278c832eec7bfc5539545f5b19c5dd69222f 100644 (file)
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -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,

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 1b028be19193f8e4df43c39f0fd9a9023294fb28..1639f75b54dff4b1fe33ae5fe16e28b726557ace 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -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);

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 543aca2fb75e72903879c116a2e5b0b5b847a35e..38bc8d74f4cc23b79d706c15177db62fcc794b84 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1283,7 +1283,7 @@ got:
        inode->i_generation = get_random_u32();
 
        /* Precompute checksum seed for inode metadata */
-       if (ext4_has_metadata_csum(sb)) {
+       if (ext4_has_feature_metadata_csum(sb)) {
                __u32 csum;
                __le32 inum = cpu_to_le32(inode->i_ino);
                __le32 gen = cpu_to_le32(inode->i_generation);

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index a9d333619241f035e7fd6f32c82bed4b8ada2d0e..f608f6554b95b569a0cc3754fb30e7afa9a66f42 100644 (file)
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1081,7 +1081,7 @@ static int ext4_finish_convert_inline_dir(handle_t *handle,
        memcpy((void *)de, buf + EXT4_INLINE_DOTDOT_SIZE,
                inline_size - EXT4_INLINE_DOTDOT_SIZE);
 
-       if (ext4_has_metadata_csum(inode->i_sb))
+       if (ext4_has_feature_metadata_csum(inode->i_sb))
                csum_size = sizeof(struct ext4_dir_entry_tail);
 
        inode->i_size = inode->i_sb->s_blocksize;

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 7d965338c7d203ff46b7aae2f82a065caebb9c82..018e615458cd2d789d1dcdb48b85492aee659640 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -94,7 +94,7 @@ static int ext4_inode_csum_verify(struct inode *inode, struct ext4_inode *raw,
 
        if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
            cpu_to_le32(EXT4_OS_LINUX) ||
-           !ext4_has_metadata_csum(inode->i_sb))
+           !ext4_has_feature_metadata_csum(inode->i_sb))
                return 1;
 
        provided = le16_to_cpu(raw->i_checksum_lo);
@@ -115,7 +115,7 @@ void ext4_inode_csum_set(struct inode *inode, struct ext4_inode *raw,
 
        if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
            cpu_to_le32(EXT4_OS_LINUX) ||
-           !ext4_has_metadata_csum(inode->i_sb))
+           !ext4_has_feature_metadata_csum(inode->i_sb))
                return;
 
        csum = ext4_inode_csum(inode, raw, ei);
@@ -4822,7 +4822,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
                ei->i_extra_isize = 0;
 
        /* Precompute checksum seed for inode metadata */
-       if (ext4_has_metadata_csum(sb)) {
+       if (ext4_has_feature_metadata_csum(sb)) {
                struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
                __u32 csum;
                __le32 inum = cpu_to_le32(inode->i_ino);
@@ -4909,7 +4909,8 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
         * we'd normally treat htree data as empty space. But with metadata
         * checksumming that corrupts checksums so forbid that.
         */
-       if (!ext4_has_feature_dir_index(sb) && ext4_has_metadata_csum(sb) &&
+       if (!ext4_has_feature_dir_index(sb) &&
+           ext4_has_feature_metadata_csum(sb) &&
            ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) {
                ext4_error_inode(inode, function, line, 0,
                         "iget: Dir with htree data on filesystem without dir_index feature.");

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 0c5ce9c2cdfc610112ed085b79f3ec1f833a5fa2..d17207386ead132bfd504083a5fd851efb94e398 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -142,7 +142,7 @@ static int ext4_update_backup_sb(struct super_block *sb,
 
        es = (struct ext4_super_block *) (bh->b_data + offset);
        lock_buffer(bh);
-       if (ext4_has_metadata_csum(sb) &&
+       if (ext4_has_feature_metadata_csum(sb) &&
            es->s_checksum != ext4_superblock_csum(sb, es)) {
                ext4_msg(sb, KERN_ERR, "Invalid checksum for backup "
                "superblock %llu", sb_block);
@@ -150,7 +150,7 @@ static int ext4_update_backup_sb(struct super_block *sb,
                goto out_bh;
        }
        func(es, arg);
-       if (ext4_has_metadata_csum(sb))
+       if (ext4_has_feature_metadata_csum(sb))
                es->s_checksum = ext4_superblock_csum(sb, es);
        set_buffer_uptodate(bh);
        unlock_buffer(bh);
@@ -351,7 +351,7 @@ void ext4_reset_inode_seed(struct inode *inode)
        __le32 gen = cpu_to_le32(inode->i_generation);
        __u32 csum;
 
-       if (!ext4_has_metadata_csum(inode->i_sb))
+       if (!ext4_has_feature_metadata_csum(inode->i_sb))
                return;
 
        csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum, sizeof(inum));
@@ -1205,7 +1205,8 @@ static int ext4_ioctl_setuuid(struct file *filp,
         * If any checksums (group descriptors or metadata) are being used
         * then the checksum seed feature is required to change the UUID.
         */
-       if (((ext4_has_feature_gdt_csum(sb) || ext4_has_metadata_csum(sb))
+       if (((ext4_has_feature_gdt_csum(sb) ||
+             ext4_has_feature_metadata_csum(sb))
                        && !ext4_has_feature_csum_seed(sb))
                || ext4_has_feature_stable_inodes(sb))
                return -EOPNOTSUPP;
@@ -1253,7 +1254,7 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                if (!inode_owner_or_capable(idmap, inode))
                        return -EPERM;
 
-               if (ext4_has_metadata_csum(inode->i_sb)) {
+               if (ext4_has_feature_metadata_csum(inode->i_sb)) {
                        ext4_warning(sb, "Setting inode version is not "
                                     "supported with metadata_csum enabled.");
                        return -ENOTTY;

diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index af6b3b746fe51f5faf0e890775bb3f9cec6ad72f..3e26464b14256469a57f6ef5339809b8de3bed8f 100644 (file)
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -21,7 +21,7 @@ static __le32 ext4_mmp_csum(struct super_block *sb, struct mmp_struct *mmp)
 
 static int ext4_mmp_csum_verify(struct super_block *sb, struct mmp_struct *mmp)
 {
-       if (!ext4_has_metadata_csum(sb))
+       if (!ext4_has_feature_metadata_csum(sb))
                return 1;
 
        return mmp->mmp_checksum == ext4_mmp_csum(sb, mmp);
@@ -29,7 +29,7 @@ static int ext4_mmp_csum_verify(struct super_block *sb, struct mmp_struct *mmp)
 
 static void ext4_mmp_csum_set(struct super_block *sb, struct mmp_struct *mmp)
 {
-       if (!ext4_has_metadata_csum(sb))
+       if (!ext4_has_feature_metadata_csum(sb))
                return;
 
        mmp->mmp_checksum = ext4_mmp_csum(sb, mmp);

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 15612634376a6ebbaace926a11e11c9198effeff..43f96ef4aa012617133cecb60201b82acd6ad1a4 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -176,7 +176,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,
                brelse(bh);
                return ERR_PTR(-EFSCORRUPTED);
        }
-       if (!ext4_has_metadata_csum(inode->i_sb) ||
+       if (!ext4_has_feature_metadata_csum(inode->i_sb) ||
            buffer_verified(bh))
                return bh;
 
@@ -368,7 +368,7 @@ int ext4_dirblock_csum_verify(struct inode *inode, struct buffer_head *bh)
 {
        struct ext4_dir_entry_tail *t;
 
-       if (!ext4_has_metadata_csum(inode->i_sb))
+       if (!ext4_has_feature_metadata_csum(inode->i_sb))
                return 1;
 
        t = get_dirent_tail(inode, bh);
@@ -389,7 +389,7 @@ static void ext4_dirblock_csum_set(struct inode *inode,
 {
        struct ext4_dir_entry_tail *t;
 
-       if (!ext4_has_metadata_csum(inode->i_sb))
+       if (!ext4_has_feature_metadata_csum(inode->i_sb))
                return;
 
        t = get_dirent_tail(inode, bh);
@@ -464,7 +464,7 @@ static int ext4_dx_csum_verify(struct inode *inode,
        struct dx_tail *t;
        int count_offset, limit, count;
 
-       if (!ext4_has_metadata_csum(inode->i_sb))
+       if (!ext4_has_feature_metadata_csum(inode->i_sb))
                return 1;
 
        c = get_dx_countlimit(inode, dirent, &count_offset);
@@ -493,7 +493,7 @@ static void ext4_dx_csum_set(struct inode *inode, struct ext4_dir_entry *dirent)
        struct dx_tail *t;
        int count_offset, limit, count;
 
-       if (!ext4_has_metadata_csum(inode->i_sb))
+       if (!ext4_has_feature_metadata_csum(inode->i_sb))
                return;
 
        c = get_dx_countlimit(inode, dirent, &count_offset);
@@ -582,7 +582,7 @@ static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
                        ext4_dir_rec_len(1, NULL) -
                        ext4_dir_rec_len(2, NULL) - infosize;
 
-       if (ext4_has_metadata_csum(dir->i_sb))
+       if (ext4_has_feature_metadata_csum(dir->i_sb))
                entry_space -= sizeof(struct dx_tail);
        return entry_space / sizeof(struct dx_entry);
 }
@@ -592,7 +592,7 @@ static inline unsigned dx_node_limit(struct inode *dir)
        unsigned int entry_space = dir->i_sb->s_blocksize -
                        ext4_dir_rec_len(0, dir);
 
-       if (ext4_has_metadata_csum(dir->i_sb))
+       if (ext4_has_feature_metadata_csum(dir->i_sb))
                entry_space -= sizeof(struct dx_tail);
        return entry_space / sizeof(struct dx_entry);
 }
@@ -1046,7 +1046,7 @@ static int htree_dirblock_to_tree(struct file *dir_file,
        struct ext4_dir_entry_2 *de, *top;
        int err = 0, count = 0;
        struct fscrypt_str fname_crypto_str = FSTR_INIT(NULL, 0), tmp_str;
-       int csum = ext4_has_metadata_csum(dir->i_sb);
+       int csum = ext4_has_feature_metadata_csum(dir->i_sb);
 
        dxtrace(printk(KERN_INFO "In htree dirblock_to_tree: block %lu\n",
                                                        (unsigned long)block));
@@ -1290,7 +1290,7 @@ static int dx_make_map(struct inode *dir, struct buffer_head *bh,
        struct dx_hash_info h = *hinfo;
        int blocksize = EXT4_BLOCK_SIZE(dir->i_sb);
 
-       if (ext4_has_metadata_csum(dir->i_sb))
+       if (ext4_has_feature_metadata_csum(dir->i_sb))
                buflen -= sizeof(struct ext4_dir_entry_tail);
 
        while ((char *) de < base + buflen) {
@@ -1921,7 +1921,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
        int     csum_size = 0;
        int     err = 0, i;
 
-       if (ext4_has_metadata_csum(dir->i_sb))
+       if (ext4_has_feature_metadata_csum(dir->i_sb))
                csum_size = sizeof(struct ext4_dir_entry_tail);
 
        bh2 = ext4_append(handle, dir, &newblock);
@@ -2118,7 +2118,7 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
        int             csum_size = 0;
        int             err, err2;
 
-       if (ext4_has_metadata_csum(inode->i_sb))
+       if (ext4_has_feature_metadata_csum(inode->i_sb))
                csum_size = sizeof(struct ext4_dir_entry_tail);
 
        if (!de) {
@@ -2227,7 +2227,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
        struct fake_dirent *fde;
        int csum_size = 0;
 
-       if (ext4_has_metadata_csum(inode->i_sb))
+       if (ext4_has_feature_metadata_csum(inode->i_sb))
                csum_size = sizeof(struct ext4_dir_entry_tail);
 
        blocksize =  dir->i_sb->s_blocksize;
@@ -2371,7 +2371,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
        ext4_lblk_t block, blocks;
        int     csum_size = 0;
 
-       if (ext4_has_metadata_csum(inode->i_sb))
+       if (ext4_has_feature_metadata_csum(inode->i_sb))
                csum_size = sizeof(struct ext4_dir_entry_tail);
 
        sb = dir->i_sb;
@@ -2402,7 +2402,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
                if (!retval || (retval != ERR_BAD_DX_DIR))
                        goto out;
                /* Can we just ignore htree data? */
-               if (ext4_has_metadata_csum(sb)) {
+               if (ext4_has_feature_metadata_csum(sb)) {
                        EXT4_ERROR_INODE(dir,
                                "Directory has corrupted htree index.");
                        retval = -EFSCORRUPTED;
@@ -2716,7 +2716,7 @@ static int ext4_delete_entry(handle_t *handle,
                        return err;
        }
 
-       if (ext4_has_metadata_csum(dir->i_sb))
+       if (ext4_has_feature_metadata_csum(dir->i_sb))
                csum_size = sizeof(struct ext4_dir_entry_tail);
 
        BUFFER_TRACE(bh, "get_write_access");
@@ -2956,7 +2956,7 @@ int ext4_init_new_dir(handle_t *handle, struct inode *dir,
        int csum_size = 0;
        int err;
 
-       if (ext4_has_metadata_csum(dir->i_sb))
+       if (ext4_has_feature_metadata_csum(dir->i_sb))
                csum_size = sizeof(struct ext4_dir_entry_tail);
 
        if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {

diff --git a/fs/ext4/orphan.c b/fs/ext4/orphan.c
index e5b47dda331759c649e8f127bc4911053acb05b7..c66e0cb29bd45c728e349745cb735396a51e9a7b 100644 (file)
--- a/fs/ext4/orphan.c
+++ b/fs/ext4/orphan.c
@@ -537,7 +537,7 @@ static int ext4_orphan_file_block_csum_verify(struct super_block *sb,
        struct ext4_orphan_block_tail *ot;
        __le64 dsk_block_nr = cpu_to_le64(bh->b_blocknr);
 
-       if (!ext4_has_metadata_csum(sb))
+       if (!ext4_has_feature_metadata_csum(sb))
                return 1;
 
        ot = ext4_orphan_block_tail(sb, bh);

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 72f77f78ae8df37c844e47d8933bd9269ba53178..b7ff0d955f0da00e49402e16a83d95f3426f342d 100644 (file)
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1118,7 +1118,7 @@ static inline void ext4_set_block_group_nr(struct super_block *sb, char *data,
        struct ext4_super_block *es = (struct ext4_super_block *) data;
 
        es->s_block_group_nr = cpu_to_le16(group);
-       if (ext4_has_metadata_csum(sb))
+       if (ext4_has_feature_metadata_csum(sb))
                es->s_checksum = ext4_superblock_csum(sb, es);
 }
 
@@ -1315,7 +1315,7 @@ static int ext4_set_bitmap_checksums(struct super_block *sb,
 {
        struct buffer_head *bh;
 
-       if (!ext4_has_metadata_csum(sb))
+       if (!ext4_has_feature_metadata_csum(sb))
                return 0;
 
        bh = ext4_get_bitmap(sb, group_data->inode_bitmap);

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4e495d5e74a0b38f1b8709c9d7b8145b44a8bad8..cdc435af1088e448c4c14832be2249bc8f47ee5d 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -301,7 +301,7 @@ __le32 ext4_superblock_csum(struct super_block *sb,
 static int ext4_superblock_csum_verify(struct super_block *sb,
                                       struct ext4_super_block *es)
 {
-       if (!ext4_has_metadata_csum(sb))
+       if (!ext4_has_feature_metadata_csum(sb))
                return 1;
 
        return es->s_checksum == ext4_superblock_csum(sb, es);
@@ -311,7 +311,7 @@ void ext4_superblock_csum_set(struct super_block *sb)
 {
        struct ext4_super_block *es = EXT4_SB(sb)->s_es;
 
-       if (!ext4_has_metadata_csum(sb))
+       if (!ext4_has_feature_metadata_csum(sb))
                return;
 
        es->s_checksum = ext4_superblock_csum(sb, es);
@@ -3202,7 +3202,7 @@ static __le16 ext4_group_desc_csum(struct super_block *sb, __u32 block_group,
        __le32 le_group = cpu_to_le32(block_group);
        struct ext4_sb_info *sbi = EXT4_SB(sb);
 
-       if (ext4_has_metadata_csum(sbi->s_sb)) {
+       if (ext4_has_feature_metadata_csum(sbi->s_sb)) {
                /* Use new metadata_csum algorithm */
                __u32 csum32;
                __u16 dummy_csum = 0;
@@ -4059,7 +4059,7 @@ static int set_journal_csum_feature_set(struct super_block *sb)
        int compat, incompat;
        struct ext4_sb_info *sbi = EXT4_SB(sb);
 
-       if (ext4_has_metadata_csum(sb)) {
+       if (ext4_has_feature_metadata_csum(sb)) {
                /* journal checksum v3 */
                compat = 0;
                incompat = JBD2_FEATURE_INCOMPAT_CSUM_V3;
@@ -4347,7 +4347,7 @@ static void ext4_set_def_opts(struct super_block *sb,
        if (ext4_has_feature_fast_commit(sb))
                set_opt2(sb, JOURNAL_FAST_COMMIT);
        /* don't forget to enable journal_csum when metadata_csum is enabled. */
-       if (ext4_has_metadata_csum(sb))
+       if (ext4_has_feature_metadata_csum(sb))
                set_opt(sb, JOURNAL_CHECKSUM);
 
        if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA)
@@ -4640,7 +4640,8 @@ static int ext4_init_metadata_csum(struct super_block *sb, struct ext4_super_blo
        /* Precompute checksum seed for all metadata */
        if (ext4_has_feature_csum_seed(sb))
                sbi->s_csum_seed = le32_to_cpu(es->s_checksum_seed);
-       else if (ext4_has_metadata_csum(sb) || ext4_has_feature_ea_inode(sb))
+       else if (ext4_has_feature_metadata_csum(sb) ||
+                ext4_has_feature_ea_inode(sb))
                sbi->s_csum_seed = ext4_chksum(sbi, ~0, es->s_uuid,
                                               sizeof(es->s_uuid));
        return 0;

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 6ff94cdf1515c50d626d33f57181642f47a03c50..f777713c9ddb4d0bf895b8f877ef0ed5da7a05c2 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -156,7 +156,7 @@ static int ext4_xattr_block_csum_verify(struct inode *inode,
        struct ext4_xattr_header *hdr = BHDR(bh);
        int ret = 1;
 
-       if (ext4_has_metadata_csum(inode->i_sb)) {
+       if (ext4_has_feature_metadata_csum(inode->i_sb)) {
                lock_buffer(bh);
                ret = (hdr->h_checksum == ext4_xattr_block_csum(inode,
                                                        bh->b_blocknr, hdr));
@@ -168,7 +168,7 @@ static int ext4_xattr_block_csum_verify(struct inode *inode,
 static void ext4_xattr_block_csum_set(struct inode *inode,
                                      struct buffer_head *bh)
 {
-       if (ext4_has_metadata_csum(inode->i_sb))
+       if (ext4_has_feature_metadata_csum(inode->i_sb))
                BHDR(bh)->h_checksum = ext4_xattr_block_csum(inode,
                                                bh->b_blocknr, BHDR(bh));
 }