From: Theodore Ts'o Date: Mon, 1 Jul 2013 12:12:38 +0000 (-0400) Subject: jbd2: move superblock checksum calculation to jbd2_write_superblock() X-Git-Tag: v3.9.11~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1582fec20b0ca141667523a2a0e2cb488712087;p=thirdparty%2Fkernel%2Fstable.git jbd2: move superblock checksum calculation to jbd2_write_superblock() commit fe52d17cdd343ac43c85cf72940a58865b9d3bfb upstream. Some of the functions which modify the jbd2 superblock were not updating the checksum before calling jbd2_write_superblock(). Move the call to jbd2_superblock_csum_set() to jbd2_write_superblock(), so that the checksum is calculated consistently. Signed-off-by: "Theodore Ts'o" Cc: Darrick J. Wong Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 886ec2faa9b41..d312f0b0366ef 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1320,6 +1320,7 @@ static int journal_reset(journal_t *journal) static void jbd2_write_superblock(journal_t *journal, int write_op) { struct buffer_head *bh = journal->j_sb_buffer; + journal_superblock_t *sb = journal->j_superblock; int ret; trace_jbd2_write_superblock(journal, write_op); @@ -1341,6 +1342,7 @@ static void jbd2_write_superblock(journal_t *journal, int write_op) clear_buffer_write_io_error(bh); set_buffer_uptodate(bh); } + jbd2_superblock_csum_set(journal, sb); get_bh(bh); bh->b_end_io = end_buffer_write_sync; ret = submit_bh(write_op, bh); @@ -1437,7 +1439,6 @@ void jbd2_journal_update_sb_errno(journal_t *journal) jbd_debug(1, "JBD2: updating superblock error (errno %d)\n", journal->j_errno); sb->s_errno = cpu_to_be32(journal->j_errno); - jbd2_superblock_csum_set(journal, sb); read_unlock(&journal->j_state_lock); jbd2_write_superblock(journal, WRITE_SYNC);