---

yaml --- r: 296575 b: refs/heads/master c: c254c9e h: refs/heads/master i: 296573: 9a052d8 296571: 4a7f495 296567: e64123f 296559: f41d487 296543: 8c8a966 296511: 1cc88f7 296447: a2413f4 v: v3
git-mirror · Mar 14, 2012 · 749f0a0 · 749f0a0
1 parent c4b20bc
commit 749f0a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bebccf90127859085f6a020f08ff7f648e285a0
+refs/heads/master: c254c9ec14d5c418c8f36ea7573edae2470a1dc1
diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c
@@ -1676,10 +1676,8 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
 	spin_lock(&journal->j_list_lock);
 	if (jh->b_cp_transaction != NULL && jh->b_transaction == NULL) {
 		/* written-back checkpointed metadata buffer */
-		if (jh->b_jlist == BJ_None) {
-			JBUFFER_TRACE(jh, "remove from checkpoint list");
-			__jbd2_journal_remove_checkpoint(jh);
-		}
+		JBUFFER_TRACE(jh, "remove from checkpoint list");
+		__jbd2_journal_remove_checkpoint(jh);
 	}
 	spin_unlock(&journal->j_list_lock);
 out: