From 0a3fbdf8567e13e167dc02be3435d6793c811133 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Thu, 2 Jun 2005 14:02:00 -0700
Subject: [PATCH] --- yaml --- r: 1787 b: refs/heads/master c:
 00ea81459c279f14a7b344320a71c94f60f88929 h: refs/heads/master i:   1785:
 4c28d17652304a7a4fc62378776116653c8cdb91   1783:
 80f5f6c65173b5914090b364f8d5c4ce880e4832 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/jbd/checkpoint.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8d962952c1be..0aefaec7ae77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e86d1c648508fd50e6c9960576b87906a7906ad
+refs/heads/master: 00ea81459c279f14a7b344320a71c94f60f88929
diff --git a/trunk/fs/jbd/checkpoint.c b/trunk/fs/jbd/checkpoint.c
index 98d830401c56..58133ab9457e 100644
--- a/trunk/fs/jbd/checkpoint.c
+++ b/trunk/fs/jbd/checkpoint.c
@@ -339,8 +339,10 @@ int log_do_checkpoint(journal_t *journal)
 			}
 		} while (jh != last_jh && !retry);
 
-		if (batch_count)
+		if (batch_count) {
 			__flush_batch(journal, bhs, &batch_count);
+			retry = 1;
+		}
 
 		/*
 		 * If someone cleaned up this transaction while we slept, we're