[PATCH] jbd: log_do_checkpoint fix

8d3c7fce · Jan Kara <[email protected]> · 2006-01-18 17:42:19 -08:00

While checkpointing we have to check that our transaction still is in the
checkpoint list *and* (not or) that it's not just a different transaction
with the same address.

Signed-off-by: Jan Kara <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b
Parents: 2149bcab

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/jbd/checkpoint.c	modified	+1	−1	View file

fs/jbd/checkpoint.c

View file

diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index cb3cef5..e6265a0 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -338,7 +338,7 @@ restart:
 	 * done (maybe it's a new transaction, but it fell at the same
 	 * address).
 	 */
- 	if (journal->j_checkpoint_transactions == transaction ||
+ 	if (journal->j_checkpoint_transactions == transaction &&
 			transaction->t_tid == this_tid) {
 		int batch_count = 0;
 		struct buffer_head *bhs[NR_BATCH];