2007-07-16 06:37:42

by Andrew Morton

[permalink] [raw]
Subject: [patch 002/268] jbd 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/jbd/commit.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN fs/jbd/commit.c~jbd-commit-fix-transaction-dropping fs/jbd/commit.c
--- a/fs/jbd/commit.c~jbd-commit-fix-transaction-dropping
+++ a/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) {
_


2007-08-07 09:07:15

by Greg KH

[permalink] [raw]
Subject: patch jbd-commit-fix-transaction-dropping.patch queued to -stable tree


This is a note to let you know that we have just queued up the patch titled

Subject: jbd commit: fix transaction dropping

to the 2.6.22-stable tree. Its filename is

jbd-commit-fix-transaction-dropping.patch

A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary


>From [email protected] Sun Jul 15 23:37:47 2007
From: Jan Kara <[email protected]>
Date: Sun, 15 Jul 2007 23:37:18 -0700
Subject: jbd commit: fix transaction dropping
To: [email protected]
Cc: [email protected]z.org, [email protected], [email protected], [email protected], [email protected], [email protected]
Message-ID: <[email protected]>


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]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff -puN fs/jbd/commit.c~jbd-commit-fix-transaction-dropping fs/jbd/commit.c
--- a/fs/jbd/commit.c~jbd-commit-fix-transaction-dropping
+++ a/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) {
_

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable



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

queue-2.6.22/jbd-commit-fix-transaction-dropping.patch
queue-2.6.22/jbd2-commit-fix-transaction-dropping.patch