diff options
author | Darrick J. Wong <djwong@us.ibm.com> | 2012-05-27 08:12:12 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-05-27 08:12:12 -0400 |
commit | c390087591dcbecd244c31d979ccdad49ae83364 (patch) | |
tree | c3ccbd028cb7970070114a8b0f45adfbebb113cb /fs/jbd2/commit.c | |
parent | 1f56c5890e3e815c6f4eabfc87a8a81f439b6f3d (diff) |
jbd2: checksum data blocks that are stored in the journal
Calculate and verify checksums of each data block being stored in the journal.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 16e1fe2a769f..216f4299f65e 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -338,6 +338,26 @@ static void jbd2_descr_block_csum_set(journal_t *j, | |||
338 | tail->t_checksum = cpu_to_be32(csum); | 338 | tail->t_checksum = cpu_to_be32(csum); |
339 | } | 339 | } |
340 | 340 | ||
341 | static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag, | ||
342 | struct buffer_head *bh, __u32 sequence) | ||
343 | { | ||
344 | struct page *page = bh->b_page; | ||
345 | __u8 *addr; | ||
346 | __u32 csum; | ||
347 | |||
348 | if (!JBD2_HAS_INCOMPAT_FEATURE(j, JBD2_FEATURE_INCOMPAT_CSUM_V2)) | ||
349 | return; | ||
350 | |||
351 | sequence = cpu_to_be32(sequence); | ||
352 | addr = kmap_atomic(page, KM_USER0); | ||
353 | csum = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&sequence, | ||
354 | sizeof(sequence)); | ||
355 | csum = jbd2_chksum(j, csum, addr + offset_in_page(bh->b_data), | ||
356 | bh->b_size); | ||
357 | kunmap_atomic(addr, KM_USER0); | ||
358 | |||
359 | tag->t_checksum = cpu_to_be32(csum); | ||
360 | } | ||
341 | /* | 361 | /* |
342 | * jbd2_journal_commit_transaction | 362 | * jbd2_journal_commit_transaction |
343 | * | 363 | * |
@@ -669,6 +689,8 @@ void jbd2_journal_commit_transaction(journal_t *journal) | |||
669 | tag = (journal_block_tag_t *) tagp; | 689 | tag = (journal_block_tag_t *) tagp; |
670 | write_tag_block(tag_bytes, tag, jh2bh(jh)->b_blocknr); | 690 | write_tag_block(tag_bytes, tag, jh2bh(jh)->b_blocknr); |
671 | tag->t_flags = cpu_to_be16(tag_flag); | 691 | tag->t_flags = cpu_to_be16(tag_flag); |
692 | jbd2_block_tag_csum_set(journal, tag, jh2bh(new_jh), | ||
693 | commit_transaction->t_tid); | ||
672 | tagp += tag_bytes; | 694 | tagp += tag_bytes; |
673 | space_left -= tag_bytes; | 695 | space_left -= tag_bytes; |
674 | 696 | ||