Commit 76005718 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

jbd2: remove journal_t argument from jbd2_chksum() 



Since jbd2_chksum() no longer uses its journal_t argument, remove it.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarBaokun Li <libaokun1@huawei.com>
Link: https://patch.msgid.link/20250513053809.699974-4-ebiggers@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 6017dbb7

fs/jbd2/commit.c

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void jbd2_commit_block_csum_set(journal_t *j, struct buffer_head *bh) 
	h->h_chksum_type = 0;

	h->h_chksum_size = 0;

	h->h_chksum[0] = 0;

	csum = jbd2_chksum(j, j->j_csum_seed, bh->b_data, j->j_blocksize);

	csum = jbd2_chksum(j->j_csum_seed, bh->b_data, j->j_blocksize);

	h->h_chksum[0] = cpu_to_be32(csum);

}
@@ -330,8 +330,8 @@ static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag, 


	seq = cpu_to_be32(sequence);

	addr = kmap_local_folio(bh->b_folio, bh_offset(bh));

	csum32 = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&seq, sizeof(seq));

	csum32 = jbd2_chksum(j, csum32, addr, bh->b_size);

	csum32 = jbd2_chksum(j->j_csum_seed, (__u8 *)&seq, sizeof(seq));

	csum32 = jbd2_chksum(csum32, addr, bh->b_size);

	kunmap_local(addr);



	if (jbd2_has_feature_csum3(j))

fs/jbd2/journal.c

+4 −4
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static __be32 jbd2_superblock_csum(journal_t *j, journal_superblock_t *sb) 


	old_csum = sb->s_checksum;

	sb->s_checksum = 0;

	csum = jbd2_chksum(j, ~0, (char *)sb, sizeof(journal_superblock_t));

	csum = jbd2_chksum(~0, (char *)sb, sizeof(journal_superblock_t));

	sb->s_checksum = old_csum;



	return cpu_to_be32(csum);
@@ -1000,7 +1000,7 @@ void jbd2_descriptor_block_csum_set(journal_t *j, struct buffer_head *bh) 
	tail = (struct jbd2_journal_block_tail *)(bh->b_data + j->j_blocksize -

			sizeof(struct jbd2_journal_block_tail));

	tail->t_checksum = 0;

	csum = jbd2_chksum(j, j->j_csum_seed, bh->b_data, j->j_blocksize);

	csum = jbd2_chksum(j->j_csum_seed, bh->b_data, j->j_blocksize);

	tail->t_checksum = cpu_to_be32(csum);

}
@@ -1490,7 +1490,7 @@ static int journal_load_superblock(journal_t *journal) 
		journal->j_total_len = be32_to_cpu(sb->s_maxlen);

	/* Precompute checksum seed for all metadata */

	if (jbd2_journal_has_csum_v2or3(journal))

		journal->j_csum_seed = jbd2_chksum(journal, ~0, sb->s_uuid,

		journal->j_csum_seed = jbd2_chksum(~0, sb->s_uuid,

						   sizeof(sb->s_uuid));

	/* After journal features are set, we can compute transaction limits */

	jbd2_journal_init_transaction_limits(journal);
@@ -2336,7 +2336,7 @@ int jbd2_journal_set_features(journal_t *journal, unsigned long compat, 
		sb->s_checksum_type = JBD2_CRC32C_CHKSUM;

		sb->s_feature_compat &=

			~cpu_to_be32(JBD2_FEATURE_COMPAT_CHECKSUM);

		journal->j_csum_seed = jbd2_chksum(journal, ~0, sb->s_uuid,

		journal->j_csum_seed = jbd2_chksum(~0, sb->s_uuid,

						   sizeof(sb->s_uuid));

	}

fs/jbd2/recovery.c

+5 −5
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int jbd2_descriptor_block_csum_verify(journal_t *j, void *buf) 
		j->j_blocksize - sizeof(struct jbd2_journal_block_tail));

	provided = tail->t_checksum;

	tail->t_checksum = 0;

	calculated = jbd2_chksum(j, j->j_csum_seed, buf, j->j_blocksize);

	calculated = jbd2_chksum(j->j_csum_seed, buf, j->j_blocksize);

	tail->t_checksum = provided;



	return provided == cpu_to_be32(calculated);
@@ -440,7 +440,7 @@ static int jbd2_commit_block_csum_verify(journal_t *j, void *buf) 
	h = buf;

	provided = h->h_chksum[0];

	h->h_chksum[0] = 0;

	calculated = jbd2_chksum(j, j->j_csum_seed, buf, j->j_blocksize);

	calculated = jbd2_chksum(j->j_csum_seed, buf, j->j_blocksize);

	h->h_chksum[0] = provided;



	return provided == cpu_to_be32(calculated);
@@ -461,7 +461,7 @@ static bool jbd2_commit_block_csum_verify_partial(journal_t *j, void *buf) 
	h = tmpbuf;

	provided = h->h_chksum[0];

	h->h_chksum[0] = 0;

	calculated = jbd2_chksum(j, j->j_csum_seed, tmpbuf, j->j_blocksize);

	calculated = jbd2_chksum(j->j_csum_seed, tmpbuf, j->j_blocksize);

	kfree(tmpbuf);



	return provided == cpu_to_be32(calculated);
@@ -478,8 +478,8 @@ static int jbd2_block_tag_csum_verify(journal_t *j, journal_block_tag_t *tag, 
		return 1;



	seq = cpu_to_be32(sequence);

	csum32 = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&seq, sizeof(seq));

	csum32 = jbd2_chksum(j, csum32, buf, j->j_blocksize);

	csum32 = jbd2_chksum(j->j_csum_seed, (__u8 *)&seq, sizeof(seq));

	csum32 = jbd2_chksum(csum32, buf, j->j_blocksize);



	if (jbd2_has_feature_csum3(j))

		return tag3->t_checksum == cpu_to_be32(csum32);

include/linux/jbd2.h

+1 −2
Original line number Diff line number Diff line
@@ -1766,8 +1766,7 @@ static inline unsigned long jbd2_log_space_left(journal_t *journal) 
#define BJ_Reserved	4	/* Buffer is reserved for access by journal */

#define BJ_Types	5



static inline u32 jbd2_chksum(journal_t *journal, u32 crc,

			      const void *address, unsigned int length)

static inline u32 jbd2_chksum(u32 crc, const void *address, unsigned int length)

{

	return crc32c(crc, address, length);

}