tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

jbd2: remove journal_t argument from jbd2_chksum()

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

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Baokun Li <libaokun1@huawei.com>
Link: https://patch.msgid.link/20250513053809.699974-4-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

authored by

Eric Biggers and committed by
Theodore Ts'o 76005718 6017dbb7

+13 -14
+3 -3
fs/jbd2/commit.c
··· 99 99 h->h_chksum_type = 0; 100 100 h->h_chksum_size = 0; 101 101 h->h_chksum[0] = 0; 102 - csum = jbd2_chksum(j, j->j_csum_seed, bh->b_data, j->j_blocksize); 102 + csum = jbd2_chksum(j->j_csum_seed, bh->b_data, j->j_blocksize); 103 103 h->h_chksum[0] = cpu_to_be32(csum); 104 104 } 105 105 ··· 330 330 331 331 seq = cpu_to_be32(sequence); 332 332 addr = kmap_local_folio(bh->b_folio, bh_offset(bh)); 333 - csum32 = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&seq, sizeof(seq)); 334 - csum32 = jbd2_chksum(j, csum32, addr, bh->b_size); 333 + csum32 = jbd2_chksum(j->j_csum_seed, (__u8 *)&seq, sizeof(seq)); 334 + csum32 = jbd2_chksum(csum32, addr, bh->b_size); 335 335 kunmap_local(addr); 336 336 337 337 if (jbd2_has_feature_csum3(j))
+4 -4
fs/jbd2/journal.c
··· 122 122 123 123 old_csum = sb->s_checksum; 124 124 sb->s_checksum = 0; 125 - csum = jbd2_chksum(j, ~0, (char *)sb, sizeof(journal_superblock_t)); 125 + csum = jbd2_chksum(~0, (char *)sb, sizeof(journal_superblock_t)); 126 126 sb->s_checksum = old_csum; 127 127 128 128 return cpu_to_be32(csum); ··· 1000 1000 tail = (struct jbd2_journal_block_tail *)(bh->b_data + j->j_blocksize - 1001 1001 sizeof(struct jbd2_journal_block_tail)); 1002 1002 tail->t_checksum = 0; 1003 - csum = jbd2_chksum(j, j->j_csum_seed, bh->b_data, j->j_blocksize); 1003 + csum = jbd2_chksum(j->j_csum_seed, bh->b_data, j->j_blocksize); 1004 1004 tail->t_checksum = cpu_to_be32(csum); 1005 1005 } 1006 1006 ··· 1490 1490 journal->j_total_len = be32_to_cpu(sb->s_maxlen); 1491 1491 /* Precompute checksum seed for all metadata */ 1492 1492 if (jbd2_journal_has_csum_v2or3(journal)) 1493 - journal->j_csum_seed = jbd2_chksum(journal, ~0, sb->s_uuid, 1493 + journal->j_csum_seed = jbd2_chksum(~0, sb->s_uuid, 1494 1494 sizeof(sb->s_uuid)); 1495 1495 /* After journal features are set, we can compute transaction limits */ 1496 1496 jbd2_journal_init_transaction_limits(journal); ··· 2336 2336 sb->s_checksum_type = JBD2_CRC32C_CHKSUM; 2337 2337 sb->s_feature_compat &= 2338 2338 ~cpu_to_be32(JBD2_FEATURE_COMPAT_CHECKSUM); 2339 - journal->j_csum_seed = jbd2_chksum(journal, ~0, sb->s_uuid, 2339 + journal->j_csum_seed = jbd2_chksum(~0, sb->s_uuid, 2340 2340 sizeof(sb->s_uuid)); 2341 2341 } 2342 2342
+5 -5
fs/jbd2/recovery.c
··· 185 185 j->j_blocksize - sizeof(struct jbd2_journal_block_tail)); 186 186 provided = tail->t_checksum; 187 187 tail->t_checksum = 0; 188 - calculated = jbd2_chksum(j, j->j_csum_seed, buf, j->j_blocksize); 188 + calculated = jbd2_chksum(j->j_csum_seed, buf, j->j_blocksize); 189 189 tail->t_checksum = provided; 190 190 191 191 return provided == cpu_to_be32(calculated); ··· 440 440 h = buf; 441 441 provided = h->h_chksum[0]; 442 442 h->h_chksum[0] = 0; 443 - calculated = jbd2_chksum(j, j->j_csum_seed, buf, j->j_blocksize); 443 + calculated = jbd2_chksum(j->j_csum_seed, buf, j->j_blocksize); 444 444 h->h_chksum[0] = provided; 445 445 446 446 return provided == cpu_to_be32(calculated); ··· 461 461 h = tmpbuf; 462 462 provided = h->h_chksum[0]; 463 463 h->h_chksum[0] = 0; 464 - calculated = jbd2_chksum(j, j->j_csum_seed, tmpbuf, j->j_blocksize); 464 + calculated = jbd2_chksum(j->j_csum_seed, tmpbuf, j->j_blocksize); 465 465 kfree(tmpbuf); 466 466 467 467 return provided == cpu_to_be32(calculated); ··· 478 478 return 1; 479 479 480 480 seq = cpu_to_be32(sequence); 481 - csum32 = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&seq, sizeof(seq)); 482 - csum32 = jbd2_chksum(j, csum32, buf, j->j_blocksize); 481 + csum32 = jbd2_chksum(j->j_csum_seed, (__u8 *)&seq, sizeof(seq)); 482 + csum32 = jbd2_chksum(csum32, buf, j->j_blocksize); 483 483 484 484 if (jbd2_has_feature_csum3(j)) 485 485 return tag3->t_checksum == cpu_to_be32(csum32);
+1 -2
include/linux/jbd2.h
··· 1766 1766 #define BJ_Reserved 4 /* Buffer is reserved for access by journal */ 1767 1767 #define BJ_Types 5 1768 1768 1769 - static inline u32 jbd2_chksum(journal_t *journal, u32 crc, 1770 - const void *address, unsigned int length) 1769 + static inline u32 jbd2_chksum(u32 crc, const void *address, unsigned int length) 1771 1770 { 1772 1771 return crc32c(crc, address, length); 1773 1772 }