From f8981d7ac684863ced82230661efa863d00cc651 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 1 Jul 2013 08:12:38 -0400 Subject: [PATCH] --- yaml --- r: 377631 b: refs/heads/master c: fe52d17cdd343ac43c85cf72940a58865b9d3bfb h: refs/heads/master i: 377629: f1256f6eea7922835520ddf8ccaebaae321aa86f 377627: 8e21a799fe011e87299fccf32e2f9215e1df11ba 377623: 402ae9f74dce11e4405bff5dbd75f67e4bbdc22d 377615: 0013b8ce24b7face67934b207303db71fa1c0e55 377599: 6bf9df42cc4d2ac52d78a067ba15a817e3c94d8b v: v3 --- [refs] | 2 +- trunk/fs/jbd2/journal.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e89145a51eda..a9cc937855fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aeb2817a4ea99f62532adf3377be3b282d3bda12 +refs/heads/master: fe52d17cdd343ac43c85cf72940a58865b9d3bfb diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c index 915dd575cd46..02c7ad9d7a41 100644 --- a/trunk/fs/jbd2/journal.c +++ b/trunk/fs/jbd2/journal.c @@ -1335,6 +1335,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); @@ -1356,6 +1357,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); @@ -1452,7 +1454,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);