diff options
| author | Jan Kara <jack@suse.cz> | 2007-07-16 02:37:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:34 -0400 |
| commit | fe28e42b99173ba088b1d8448e53029e100bff27 (patch) | |
| tree | d9bb33ea624fb5bde8fa2e5be0db17848f108f85 | |
| parent | 09561f44c75bc462ae86590b9c089d01c4e94a74 (diff) | |
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>
| -rw-r--r-- | fs/jbd/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 1facfaff97cb..a003d50edcdb 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
| @@ -887,7 +887,8 @@ restart_loop: | |||
| 887 | journal->j_committing_transaction = NULL; | 887 | journal->j_committing_transaction = NULL; |
| 888 | spin_unlock(&journal->j_state_lock); | 888 | spin_unlock(&journal->j_state_lock); |
| 889 | 889 | ||
| 890 | if (commit_transaction->t_checkpoint_list == NULL) { | 890 | if (commit_transaction->t_checkpoint_list == NULL && |
| 891 | commit_transaction->t_checkpoint_io_list == NULL) { | ||
| 891 | __journal_drop_transaction(journal, commit_transaction); | 892 | __journal_drop_transaction(journal, commit_transaction); |
| 892 | } else { | 893 | } else { |
| 893 | if (journal->j_checkpoint_transactions == NULL) { | 894 | if (journal->j_checkpoint_transactions == NULL) { |