diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /fs/jbd/commit.c | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'fs/jbd/commit.c')
| -rw-r--r-- | fs/jbd/commit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 29e62d98bae6..002ad2bbc769 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
| @@ -829,8 +829,7 @@ 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) { | ||
| 834 | __journal_drop_transaction(journal, commit_transaction); | 833 | __journal_drop_transaction(journal, commit_transaction); |
| 835 | } else { | 834 | } else { |
| 836 | if (journal->j_checkpoint_transactions == NULL) { | 835 | if (journal->j_checkpoint_transactions == NULL) { |