summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2007-07-15 23:37:18 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-08-09 14:27:40 -0700
commit33a8a50080fd91f66bea001fc2828a007cd2f359 (patch)
treec20a29ccd9828e9ec16165114d37ee88491e4b95
parent5f170d5e5e4c497d89ae758408db0f202d446968 (diff)
downloadlwn-33a8a50080fd91f66bea001fc2828a007cd2f359.tar.gz
lwn-33a8a50080fd91f66bea001fc2828a007cd2f359.zip
jbd 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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/jbd/commit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 1facfaff97cb..a003d50edcdb 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -887,7 +887,8 @@ restart_loop:
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) {