jbd2: remove redundant function jbd2_journal_has_csum_v2or3_feature

Since commit dd348f054b24 ("jbd2: switch to using the crc32c library"),
jbd2_journal_has_csum_v2or3() and jbd2_journal_has_csum_v2or3_feature()
are the same.  Remove jbd2_journal_has_csum_v2or3_feature() and just
keep jbd2_journal_has_csum_v2or3().

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://patch.msgid.link/20250207031424.42755-1-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index d210e8a82e666476925107f30255920f1eb230ee..51f7a8cc43a7a656130e823a7ee0a649f08822b7 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1361,7 +1361,7 @@ static int journal_check_superblock(journal_t *journal)
                return err;
        }
 
-       if (jbd2_journal_has_csum_v2or3_feature(journal) &&
+       if (jbd2_journal_has_csum_v2or3(journal) &&
            jbd2_has_feature_checksum(journal)) {
                /* Can't have checksum v1 and v2 on at the same time! */
                printk(KERN_ERR "JBD2: Can't enable checksumming v1 and v2/3 "
@@ -1369,7 +1369,7 @@ static int journal_check_superblock(journal_t *journal)
                return err;
        }
 
-       if (jbd2_journal_has_csum_v2or3_feature(journal)) {
+       if (jbd2_journal_has_csum_v2or3(journal)) {
                if (sb->s_checksum_type != JBD2_CRC32C_CHKSUM) {
                        printk(KERN_ERR "JBD2: Unknown checksum type\n");
                        return err;

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 8018d4aecf1b0192c9e5d8201268d81c8c80b1d1..c211de10e9c8a5b16cf72a8db2d69d824de8312d 100644 (file)
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1727,14 +1727,10 @@ static inline int tid_geq(tid_t x, tid_t y)
 extern int jbd2_journal_blocks_per_page(struct inode *inode);
 extern size_t journal_tag_bytes(journal_t *journal);
 
-static inline bool jbd2_journal_has_csum_v2or3_feature(journal_t *j)
-{
-       return jbd2_has_feature_csum2(j) || jbd2_has_feature_csum3(j);
-}
-
 static inline int jbd2_journal_has_csum_v2or3(journal_t *journal)
 {
-       return jbd2_journal_has_csum_v2or3_feature(journal);
+       return jbd2_has_feature_csum2(journal) ||
+              jbd2_has_feature_csum3(journal);
 }
 
 static inline int jbd2_journal_get_num_fc_blks(journal_superblock_t *jsb)