summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWengang Wang <wen.gang.wang@oracle.com>2008-06-10 14:24:48 +0800
committerMark Fasheh <mfasheh@suse.com>2008-07-14 13:57:15 -0700
commit01af482037d32c215aab208a0b110ffe6fd782c0 (patch)
treec15e6ca3753aded21dc6e0821ffc66519c5c1abb
parent56753bd3b9220f6f2477eb1cf97f40c24e0a4c91 (diff)
downloadop-kernel-dev-01af482037d32c215aab208a0b110ffe6fd782c0.zip
op-kernel-dev-01af482037d32c215aab208a0b110ffe6fd782c0.tar.gz
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>
-rw-r--r--fs/ocfs2/super.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index df63ba2..ccecfe5 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. */
OpenPOWER on IntegriCloud