[PATCH] JBD: avoid panic on corrupted journal superblock (from akpm)

Initial patch from Andrew Morton merged into 2.6 :
Don't panic if the journal superblock is wrecked: just fail the mount.

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index c02a0ef..d18df61 100644 (file)
--- a/fs/jbd/recovery.c
+++ b/fs/jbd/recovery.c
@@ -138,8 +138,11 @@ static int jread(struct buffer_head **bhp, journal_t *journal,
 
        *bhp = NULL;
 
-       J_ASSERT (offset < journal->j_maxlen);
-       
+       if (offset >= journal->j_maxlen) {
+               printk(KERN_ERR "JBD: corrupted journal superblock\n");
+               return -EIO;
+       }
+
        err = journal_bmap(journal, offset, &blocknr);
 
        if (err) {