diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
| commit | 97309d1a0bbdcb0813ea08574b4473d8e5416012 (patch) | |
| tree | 0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b /fs/jbd/commit.c | |
| parent | b4ea75b649417606fd6b38710a2962ec9770e772 (diff) | |
| parent | efd51b5c6798d103e3aa683464aebb2019b62119 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'fs/jbd/commit.c')
| -rw-r--r-- | fs/jbd/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 002ad2bbc769..29e62d98bae6 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
| @@ -829,7 +829,8 @@ restart_loop: | |||
| 829 | journal->j_committing_transaction = NULL; | 829 | journal->j_committing_transaction = NULL; |
| 830 | spin_unlock(&journal->j_state_lock); | 830 | spin_unlock(&journal->j_state_lock); |
| 831 | 831 | ||
| 832 | if (commit_transaction->t_checkpoint_list == NULL) { | 832 | if (commit_transaction->t_checkpoint_list == NULL && |
| 833 | commit_transaction->t_checkpoint_io_list == NULL) { | ||
| 833 | __journal_drop_transaction(journal, commit_transaction); | 834 | __journal_drop_transaction(journal, commit_transaction); |
| 834 | } else { | 835 | } else { |
| 835 | if (journal->j_checkpoint_transactions == NULL) { | 836 | if (journal->j_checkpoint_transactions == NULL) { |