[JFFS2] Fix slab panic

When JFFS22 is unable to read the root inode, the bad root inode object is not
freed and remains sticked in the jffs2_i slab cache. When we further try to
free the slab cache (e.g., on rmmod jffs2), slab allocator subsystem panics.
Fix this bug.

Signed-off-by: Artem B. Bityutskiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 934c9f5090c8f60e874424def79eb0ae68504285..a6661e8be25a06cf92d7e673faf4fc0d7922b0a7 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: fs.c,v 1.58 2005/07/17 12:01:42 dedekind Exp $
+ * $Id: fs.c,v 1.59 2005/07/18 11:21:19 dedekind Exp $
  *
  */
 
@@ -517,7 +517,7 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
        root_i = iget(sb, 1);
        if (is_bad_inode(root_i)) {
                D1(printk(KERN_WARNING "get root inode failed\n"));
-               goto out_nodes;
+               goto out_root_i;
        }
 
        D1(printk(KERN_DEBUG "jffs2_do_fill_super(): d_alloc_root()\n"));
@@ -535,7 +535,6 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
 
  out_root_i:
        iput(root_i);
- out_nodes:
        jffs2_free_ino_caches(c);
        jffs2_free_raw_node_refs(c);
        if (c->mtd->flags & MTD_NO_VIRTBLOCKS)