summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2006-01-18 17:42:20 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 19:20:16 -0800
commit43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92 (patch)
tree06c78af9eeab5ad504e949a78e4ffa1e3cbb6067 /fs
parent8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b (diff)
downloadop-kernel-dev-43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92.zip
op-kernel-dev-43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92.tar.gz
[PATCH] jbd: remove_transaction fix
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> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-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 002ad2b..29e62d9 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -829,7 +829,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) {
OpenPOWER on IntegriCloud