Skip to content

Commit 7600571

Browse files
ebiggerstytso
authored andcommitted
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>
1 parent 6017dbb commit 7600571

4 files changed

Lines changed: 13 additions & 14 deletions

File tree

fs/jbd2/commit.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static void jbd2_commit_block_csum_set(journal_t *j, struct buffer_head *bh)
9999
h->h_chksum_type = 0;
100100
h->h_chksum_size = 0;
101101
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);
103103
h->h_chksum[0] = cpu_to_be32(csum);
104104
}
105105

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

331331
seq = cpu_to_be32(sequence);
332332
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);
335335
kunmap_local(addr);
336336

337337
if (jbd2_has_feature_csum3(j))

fs/jbd2/journal.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static __be32 jbd2_superblock_csum(journal_t *j, journal_superblock_t *sb)
122122

123123
old_csum = sb->s_checksum;
124124
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));
126126
sb->s_checksum = old_csum;
127127

128128
return cpu_to_be32(csum);
@@ -1000,7 +1000,7 @@ void jbd2_descriptor_block_csum_set(journal_t *j, struct buffer_head *bh)
10001000
tail = (struct jbd2_journal_block_tail *)(bh->b_data + j->j_blocksize -
10011001
sizeof(struct jbd2_journal_block_tail));
10021002
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);
10041004
tail->t_checksum = cpu_to_be32(csum);
10051005
}
10061006

@@ -1490,7 +1490,7 @@ static int journal_load_superblock(journal_t *journal)
14901490
journal->j_total_len = be32_to_cpu(sb->s_maxlen);
14911491
/* Precompute checksum seed for all metadata */
14921492
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,
14941494
sizeof(sb->s_uuid));
14951495
/* After journal features are set, we can compute transaction limits */
14961496
jbd2_journal_init_transaction_limits(journal);
@@ -2336,7 +2336,7 @@ int jbd2_journal_set_features(journal_t *journal, unsigned long compat,
23362336
sb->s_checksum_type = JBD2_CRC32C_CHKSUM;
23372337
sb->s_feature_compat &=
23382338
~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,
23402340
sizeof(sb->s_uuid));
23412341
}
23422342

fs/jbd2/recovery.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static int jbd2_descriptor_block_csum_verify(journal_t *j, void *buf)
185185
j->j_blocksize - sizeof(struct jbd2_journal_block_tail));
186186
provided = tail->t_checksum;
187187
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);
189189
tail->t_checksum = provided;
190190

191191
return provided == cpu_to_be32(calculated);
@@ -440,7 +440,7 @@ static int jbd2_commit_block_csum_verify(journal_t *j, void *buf)
440440
h = buf;
441441
provided = h->h_chksum[0];
442442
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);
444444
h->h_chksum[0] = provided;
445445

446446
return provided == cpu_to_be32(calculated);
@@ -461,7 +461,7 @@ static bool jbd2_commit_block_csum_verify_partial(journal_t *j, void *buf)
461461
h = tmpbuf;
462462
provided = h->h_chksum[0];
463463
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);
465465
kfree(tmpbuf);
466466

467467
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,
478478
return 1;
479479

480480
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);
483483

484484
if (jbd2_has_feature_csum3(j))
485485
return tag3->t_checksum == cpu_to_be32(csum32);

include/linux/jbd2.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,8 +1766,7 @@ static inline unsigned long jbd2_log_space_left(journal_t *journal)
17661766
#define BJ_Reserved 4 /* Buffer is reserved for access by journal */
17671767
#define BJ_Types 5
17681768

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)
17711770
{
17721771
return crc32c(crc, address, length);
17731772
}

0 commit comments

Comments
 (0)