---

yaml --- r: 331569 b: refs/heads/master c: eeecef0 h: refs/heads/master i: 331567: 18441f9 v: v3
git-mirror · Aug 19, 2012 · 48ebb0a · 48ebb0a
1 parent c9a19de
commit 48ebb0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);