From 5f85e46d31875a3ee2c397c93374c2083f128fa5 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 18 Jan 2006 17:42:19 -0800 Subject: [PATCH] --- yaml --- r: 18898 b: refs/heads/master c: 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/checkpoint.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a3086591dd69..02dd99471aea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2149bcabc5f6fd635935d57480044ba4c11bc020 +refs/heads/master: 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b diff --git a/trunk/fs/jbd/checkpoint.c b/trunk/fs/jbd/checkpoint.c index cb3cef525c3b..e6265a0b56b8 100644 --- a/trunk/fs/jbd/checkpoint.c +++ b/trunk/fs/jbd/checkpoint.c @@ -338,7 +338,7 @@ int log_do_checkpoint(journal_t *journal) * 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];