---

yaml --- r: 322200 b: refs/heads/master c: 2e84f26 h: refs/heads/master v: v3
git-mirror · Aug 15, 2012 · 1c7fef7 · 1c7fef7
1 parent befa3f4
commit 1c7fef7
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: 48d1788493f874e5d32dccb2911a7bc91c248b4b
+refs/heads/master: 2e84f2641ea91a730642ead558a4ee3bd52310c9
diff --git 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);