X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fjbd2%2Fjournal.c;h=484b8d1c6cb6cd645a009f2cdb1c50884f3a9563;hb=70ac618c07b6ef959ff79a276b8d6c6626554dfd;hp=e149b99a7ffb8e0c0db2a042aaac864f5fc65348;hpb=69e9576bf283b0ee3423642d7e7dbe4b3a16e455;p=~andy%2Flinux

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index e149b99a7ff..484b8d1c6cb 100644
--- a/fs/jbd2/journal.c
+++ b/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);