On Thu, Feb 06, 2025 at 07:14:24PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
Looks good,
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
> fs/jbd2/journal.c | 4 ++--
> include/linux/jbd2.h | 8 ++------
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index d8084b31b3610..4de74056a3c36 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -1359,19 +1359,19 @@ static int journal_check_superblock(journal_t *journal)
> printk(KERN_ERR "JBD2: Can't enable checksumming v2 and v3 "
> "at the same time!\n");
> 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 "
> "at the same time!\n");
> 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 561025b4f3d91..a7e8163637b44 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -1734,18 +1734,14 @@ 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)
> {
> int num_fc_blocks = be32_to_cpu(jsb->s_num_fc_blks);
>
> base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b
> --
> 2.48.1
>
>
