aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2007-07-15 23:37:18 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 09:05:34 -0700
commitfe28e42b99173ba088b1d8448e53029e100bff27 (patch)
treed9bb33ea624fb5bde8fa2e5be0db17848f108f85 /fs
parent09561f44c75bc462ae86590b9c089d01c4e94a74 (diff)
downloadkernel_samsung_smdk4412-fe28e42b99173ba088b1d8448e53029e100bff27.zip
kernel_samsung_smdk4412-fe28e42b99173ba088b1d8448e53029e100bff27.tar.gz
kernel_samsung_smdk4412-fe28e42b99173ba088b1d8448e53029e100bff27.tar.bz2
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> 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/jbd/commit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 1facfaf..a003d50 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) {