From af9023c247885436e7d651a9c01b989e7008d841 Mon Sep 17 00:00:00 2001 From: Hidehiro Kawai Date: Fri, 10 Oct 2008 20:29:31 -0400 Subject: [PATCH] --- yaml --- r: 113395 b: refs/heads/master c: 7ad7445f60fe4d46c4c9d2a9463db180d2a3b270 h: refs/heads/master i: 113393: 91b0c7498431ee2139565f3bc294ba9d64aa179b 113391: e7dbc3a35e7dd0785571a6f216a1c22496aaebc9 v: v3 --- [refs] | 2 +- trunk/fs/jbd2/commit.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8cf4cc1a1bb0..06f88670f779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ffe1ea8949c75ecffb7a4d988bb881a9fa62fbe +refs/heads/master: 7ad7445f60fe4d46c4c9d2a9463db180d2a3b270 diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c index 78e4da934121..849f10496cea 100644 --- a/trunk/fs/jbd2/commit.c +++ b/trunk/fs/jbd2/commit.c @@ -504,9 +504,10 @@ void jbd2_journal_commit_transaction(journal_t *journal) jh = commit_transaction->t_buffers; /* If we're in abort mode, we just un-journal the buffer and - release it for background writing. */ + release it. */ if (is_journal_aborted(journal)) { + clear_buffer_jbddirty(jh2bh(jh)); JBUFFER_TRACE(jh, "journal is aborting: refile"); jbd2_journal_refile_buffer(journal, jh); /* If that was the last one, we need to clean up @@ -884,6 +885,8 @@ void jbd2_journal_commit_transaction(journal_t *journal) if (buffer_jbddirty(bh)) { JBUFFER_TRACE(jh, "add to new checkpointing trans"); __jbd2_journal_insert_checkpoint(jh, commit_transaction); + if (is_journal_aborted(journal)) + clear_buffer_jbddirty(bh); JBUFFER_TRACE(jh, "refile for checkpoint writeback"); __jbd2_journal_refile_buffer(jh); jbd_unlock_bh_state(bh);