From: Wengang Wang <wen.gang.wang@oracle.com>
Date: Tue, 10 Jun 2008 06:24:48 +0000 (+0800)
Subject: ocfs2: Handle error during journal load
X-Git-Tag: v2.6.27-rc1~1036^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=01af482037d32c215aab208a0b110ffe6fd782c0;p=linux-2.6-omap-h63xx.git

ocfs2: Handle error during journal load

This patch ensures the mount fails if the fs is unable to load the journal.

Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Acked-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
---

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index df63ba20ae9..ccecfe5094f 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1703,7 +1703,11 @@ static int ocfs2_check_volume(struct ocfs2_super *osb)
 	local = ocfs2_mount_local(osb);
 
 	/* will play back anything left in the journal. */
-	ocfs2_journal_load(osb->journal, local);
+	status = ocfs2_journal_load(osb->journal, local);
+	if (status < 0) {
+		mlog(ML_ERROR, "ocfs2 journal load failed! %d\n", status);
+		goto finally;
+	}
 
 	if (dirty) {
 		/* recover my local alloc if we didn't unmount cleanly. */