diff options
| author | Jan Kara <jack@suse.cz> | 2007-07-16 02:37:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:34 -0400 |
| commit | f89b779508f457b2af05dd5ac82a425db4a56ee3 (patch) | |
| tree | 868baf5eb5cdb8ddce1b8e0512238b596c83c438 /fs | |
| parent | fe28e42b99173ba088b1d8448e53029e100bff27 (diff) | |
jbd2 commit: fix transaction dropping
We have to check that also the second checkpoint list is non-empty before
dropping the transaction.
Signed-off-by: Jan Kara <jack@suse.cz>
Cc: Chuck Ebbert <cebbert@redhat.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: <linux-ext4@vger.kernel.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd2/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 2856e1100a5f..c0f59d1b13dc 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
| @@ -896,7 +896,8 @@ restart_loop: | |||
| 896 | journal->j_committing_transaction = NULL; | 896 | journal->j_committing_transaction = NULL; |
| 897 | spin_unlock(&journal->j_state_lock); | 897 | spin_unlock(&journal->j_state_lock); |
| 898 | 898 | ||
| 899 | if (commit_transaction->t_checkpoint_list == NULL) { | 899 | if (commit_transaction->t_checkpoint_list == NULL && |
| 900 | commit_transaction->t_checkpoint_io_list == NULL) { | ||
| 900 | __jbd2_journal_drop_transaction(journal, commit_transaction); | 901 | __jbd2_journal_drop_transaction(journal, commit_transaction); |
| 901 | } else { | 902 | } else { |
| 902 | if (journal->j_checkpoint_transactions == NULL) { | 903 | if (journal->j_checkpoint_transactions == NULL) { |