aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2/journal.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jbd2/journal.c')
-rw-r--r--fs/jbd2/journal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 95457576e434..aaa1a3f33b0e 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1318,6 +1318,7 @@ static int journal_reset(journal_t *journal)
1318static void jbd2_write_superblock(journal_t *journal, int write_op) 1318static void jbd2_write_superblock(journal_t *journal, int write_op)
1319{ 1319{
1320 struct buffer_head *bh = journal->j_sb_buffer; 1320 struct buffer_head *bh = journal->j_sb_buffer;
1321 journal_superblock_t *sb = journal->j_superblock;
1321 int ret; 1322 int ret;
1322 1323
1323 trace_jbd2_write_superblock(journal, write_op); 1324 trace_jbd2_write_superblock(journal, write_op);
@@ -1339,6 +1340,7 @@ static void jbd2_write_superblock(journal_t *journal, int write_op)
1339 clear_buffer_write_io_error(bh); 1340 clear_buffer_write_io_error(bh);
1340 set_buffer_uptodate(bh); 1341 set_buffer_uptodate(bh);
1341 } 1342 }
1343 jbd2_superblock_csum_set(journal, sb);
1342 get_bh(bh); 1344 get_bh(bh);
1343 bh->b_end_io = end_buffer_write_sync; 1345 bh->b_end_io = end_buffer_write_sync;
1344 ret = submit_bh(write_op, bh); 1346 ret = submit_bh(write_op, bh);
@@ -1435,7 +1437,6 @@ void jbd2_journal_update_sb_errno(journal_t *journal)
1435 jbd_debug(1, "JBD2: updating superblock error (errno %d)\n", 1437 jbd_debug(1, "JBD2: updating superblock error (errno %d)\n",
1436 journal->j_errno); 1438 journal->j_errno);
1437 sb->s_errno = cpu_to_be32(journal->j_errno); 1439 sb->s_errno = cpu_to_be32(journal->j_errno);
1438 jbd2_superblock_csum_set(journal, sb);
1439 read_unlock(&journal->j_state_lock); 1440 read_unlock(&journal->j_state_lock);
1440 1441
1441 jbd2_write_superblock(journal, WRITE_SYNC); 1442 jbd2_write_superblock(journal, WRITE_SYNC);