From e785551b921de03e7bb93eceec0b516c9e133400 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 18 Jan 2006 17:42:20 -0800 Subject: [PATCH] --- yaml --- r: 18899 b: refs/heads/master c: 43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92 h: refs/heads/master i: 18897: f7e037b4400523dd7d5a8471d64691311b0bd18a 18895: c24547acd34fc55f51e61d3fd2664e696b0e3fc9 v: v3 --- [refs] | 2 +- trunk/fs/jbd/commit.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 02dd99471aea..6cd62e005f60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d3c7fce2d20ecc3264c8d8c91ae3beacdeaed1b +refs/heads/master: 43c3e6f5abdf6acac9b90c86bf03f995bf7d3d92 diff --git a/trunk/fs/jbd/commit.c b/trunk/fs/jbd/commit.c index 002ad2bbc769..29e62d98bae6 100644 --- a/trunk/fs/jbd/commit.c +++ b/trunk/fs/jbd/commit.c @@ -829,7 +829,8 @@ void journal_commit_transaction(journal_t *journal) 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) {