summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2007-07-15 23:37:20 -0700
committerWilly Tarreau <w@1wt.eu>2007-08-25 17:24:12 +0200
commit303a2abf3e1c29f0697e9e8f71e9b7b0c506a124 (patch)
treebbc15d8946e10821e4adfbafad369504cbb82785
parent8cd286b224aa466f0087e2d60bf765889d2da6e3 (diff)
downloadlwn-303a2abf3e1c29f0697e9e8f71e9b7b0c506a124.tar.gz
lwn-303a2abf3e1c29f0697e9e8f71e9b7b0c506a124.zip
[PATCH] 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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--fs/jbd2/commit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 6bd8005e3d34..7d2954912560 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -897,7 +897,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) {
__jbd2_journal_drop_transaction(journal, commit_transaction);
} else {
if (journal->j_checkpoint_transactions == NULL) {