Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113395
b: refs/heads/master
c: 7ad7445
h: refs/heads/master
i:
  113393: 91b0c74
  113391: e7dbc3a
v: v3
  • Loading branch information
Hidehiro Kawai authored and Theodore Ts'o committed Oct 11, 2008
1 parent 284512f commit af9023c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7ffe1ea8949c75ecffb7a4d988bb881a9fa62fbe
refs/heads/master: 7ad7445f60fe4d46c4c9d2a9463db180d2a3b270
5 changes: 4 additions & 1 deletion trunk/fs/jbd2/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand 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);
Expand Down

0 comments on commit af9023c

Please sign in to comment.