From 749f0a00704ff9646caef03225cdb229292b4528 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Tue, 13 Mar 2012 22:27:44 -0400
Subject: [PATCH] --- yaml --- r: 296575 b: refs/heads/master c:
 c254c9ec14d5c418c8f36ea7573edae2470a1dc1 h: refs/heads/master i:   296573:
 9a052d87d3794f1d4bd1ee7dfb4c031904cde2e3   296571:
 4a7f4958c476bcdd6170beed8a07b2b7b9485e36   296567:
 e64123fd795631dd5513f80a088f3301e0911b8c   296559:
 f41d4873f26e2715253d372243e6d8c4f16d2883   296543:
 8c8a9666dbef6909acf18280de4972781d6f8f02   296511:
 1cc88f7d05f1aaf8b71d8ad040d3f0d6a89c2a73   296447:
 a2413f4591f114906330687570f64ce2d5fdff42 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/jbd2/transaction.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a526ebdff11f..db8e7095ca53 100644
--- 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
index 3eb326a54bf1..fd052a88e9ec 100644
--- 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: