diff options
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index cf221f3d955a..ae832cd44dd8 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -317,22 +317,6 @@ static void write_tag_block(journal_t *j, journal_block_tag_t *tag, | |||
317 | tag->t_blocknr_high = cpu_to_be32((block >> 31) >> 1); | 317 | tag->t_blocknr_high = cpu_to_be32((block >> 31) >> 1); |
318 | } | 318 | } |
319 | 319 | ||
320 | static void jbd2_descr_block_csum_set(journal_t *j, | ||
321 | struct buffer_head *bh) | ||
322 | { | ||
323 | struct jbd2_journal_block_tail *tail; | ||
324 | __u32 csum; | ||
325 | |||
326 | if (!jbd2_journal_has_csum_v2or3(j)) | ||
327 | return; | ||
328 | |||
329 | tail = (struct jbd2_journal_block_tail *)(bh->b_data + j->j_blocksize - | ||
330 | sizeof(struct jbd2_journal_block_tail)); | ||
331 | tail->t_checksum = 0; | ||
332 | csum = jbd2_chksum(j, j->j_csum_seed, bh->b_data, j->j_blocksize); | ||
333 | tail->t_checksum = cpu_to_be32(csum); | ||
334 | } | ||
335 | |||
336 | static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag, | 320 | static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag, |
337 | struct buffer_head *bh, __u32 sequence) | 321 | struct buffer_head *bh, __u32 sequence) |
338 | { | 322 | { |
@@ -714,7 +698,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) | |||
714 | 698 | ||
715 | tag->t_flags |= cpu_to_be16(JBD2_FLAG_LAST_TAG); | 699 | tag->t_flags |= cpu_to_be16(JBD2_FLAG_LAST_TAG); |
716 | 700 | ||
717 | jbd2_descr_block_csum_set(journal, descriptor); | 701 | jbd2_descriptor_block_csum_set(journal, descriptor); |
718 | start_journal_io: | 702 | start_journal_io: |
719 | for (i = 0; i < bufs; i++) { | 703 | for (i = 0; i < bufs; i++) { |
720 | struct buffer_head *bh = wbuf[i]; | 704 | struct buffer_head *bh = wbuf[i]; |