Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18899
b: refs/heads/master
c: 43c3e6f
h: refs/heads/master
i:
  18897: f7e037b
  18895: c24547a
v: v3
  • Loading branch information
Jan Kara authored and Linus Torvalds committed Jan 19, 2006
1 parent 5f85e46 commit e785551
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b
refs/heads/master: 43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92
3 changes: 2 additions & 1 deletion trunk/fs/jbd/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,8 @@ void journal_commit_transaction(journal_t *journal)
journal->j_committing_transaction = NULL;
spin_unlock(&journal->j_state_lock);

if (commit_transaction->t_checkpoint_list == NULL) {
if (commit_transaction->t_checkpoint_list == NULL &&
commit_transaction->t_checkpoint_io_list == NULL) {
__journal_drop_transaction(journal, commit_transaction);
} else {
if (journal->j_checkpoint_transactions == NULL) {
Expand Down

0 comments on commit e785551

Please sign in to comment.