From 48ebb0ae0a79eb657243b598c6415fbd1b2db9d3 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Sat, 18 Aug 2012 22:29:40 -0400
Subject: [PATCH] --- yaml --- r: 331569 b: refs/heads/master c:
 eeecef0af5ea4efd763c9554cf2bd80fc4a0efd3 h: refs/heads/master i:   331567:
 18441f9d2fa9f9eca0c399d64382197729240b12 v: v3

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

diff --git a/[refs] b/[refs]
index b56f58a4d7f9..636e28446c2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caecd0af8fe0635e8e6900399b951433af35bf52
+refs/heads/master: eeecef0af5ea4efd763c9554cf2bd80fc4a0efd3
diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c
index bd23f2ebaa67..0f16edd51f67 100644
--- a/trunk/fs/jbd2/journal.c
+++ b/trunk/fs/jbd2/journal.c
@@ -1354,6 +1354,11 @@ static void jbd2_mark_journal_empty(journal_t *journal)
 
 	BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex));
 	read_lock(&journal->j_state_lock);
+	/* Is it already empty? */
+	if (sb->s_start == 0) {
+		read_unlock(&journal->j_state_lock);
+		return;
+	}
 	jbd_debug(1, "JBD2: Marking journal as empty (seq %d)\n",
 		  journal->j_tail_sequence);