diff options
| author | Eric Biggers <ebiggers@google.com> | 2025-02-06 19:14:24 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2025-03-17 11:19:41 -0400 |
| commit | f6fc1584f500e0c036190f235b0857c6b05ee0d1 (patch) | |
| tree | 6254596c485408a60dcafa37c2fd3cfdcc2c95a6 /fs/jbd2 | |
| parent | ext4: remove redundant function ext4_has_metadata_csum (diff) | |
| download | linux-f6fc1584f500e0c036190f235b0857c6b05ee0d1.tar.gz linux-f6fc1584f500e0c036190f235b0857c6b05ee0d1.zip | |
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>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index d210e8a82e66..51f7a8cc43a7 100644 --- 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; |