2007-07-16 20:48:29

by Andrew Morton

[permalink] [raw]
Subject: - jbd2-commit-fix-transaction-dropping.patch removed from -mm tree

The patch titled
jbd2 commit: fix transaction dropping
has been removed from the -mm tree. Its filename was

This patch was dropped because it was merged into mainline or a subsystem tree

Subject: jbd2 commit: fix transaction dropping
From: Jan Kara <[email protected]>

We have to check that also the second checkpoint list is non-empty before
dropping the transaction.

Signed-off-by: Jan Kara <[email protected]>
Cc: Chuck Ebbert <[email protected]>
Cc: Kirill Korotaev <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/jbd2/commit.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN fs/jbd2/commit.c~jbd2-commit-fix-transaction-dropping fs/jbd2/commit.c
--- a/fs/jbd2/commit.c~jbd2-commit-fix-transaction-dropping
+++ a/fs/jbd2/commit.c
@@ -896,7 +896,8 @@ restart_loop:
journal->j_committing_transaction = NULL;

- 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) {

Patches currently in -mm which might be from [email protected] are