From 1c7fef737a8cd899370f72ec16c92a123ea96f1a Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Wed, 15 Aug 2012 13:50:27 +0200
Subject: [PATCH] --- yaml --- r: 322200 b: refs/heads/master c:
 2e84f2641ea91a730642ead558a4ee3bd52310c9 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/jbd/journal.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d8efd03bcda..8bb7307e22b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48d1788493f874e5d32dccb2911a7bc91c248b4b
+refs/heads/master: 2e84f2641ea91a730642ead558a4ee3bd52310c9
diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c
index 09357508ec9a..a2862339323b 100644
--- a/trunk/fs/jbd/journal.c
+++ b/trunk/fs/jbd/journal.c
@@ -1113,6 +1113,11 @@ static void mark_journal_empty(journal_t *journal)
 
 	BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex));
 	spin_lock(&journal->j_state_lock);
+	/* Is it already empty? */
+	if (sb->s_start == 0) {
+		spin_unlock(&journal->j_state_lock);
+		return;
+	}
 	jbd_debug(1, "JBD: Marking journal as empty (seq %d)\n",
         	  journal->j_tail_sequence);