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) {