This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / jffs2 / super.c

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index c37fb16..23dad47 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: super.c,v 1.97 2004/07/16 15:17:57 dwmw2 Exp $
+ * $Id: super.c,v 1.96 2004/07/13 08:57:30 dwmw2 Exp $
  *
  */
 
@@ -308,6 +308,13 @@ static int __init init_jffs2_fs(void)
                printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
                return -ENOMEM;
        }
+#ifdef CONFIG_JFFS2_PROC
+       ret = jffs2_proc_init();
+       if (ret) {
+               printk(KERN_ERR "JFFS2 error: Failed to initialise proc interface\n");
+               goto out;
+       }
+#endif
        ret = jffs2_compressors_init();
        if (ret) {
                printk(KERN_ERR "JFFS2 error: Failed to initialise compressors\n");
@@ -329,6 +336,9 @@ static int __init init_jffs2_fs(void)
        jffs2_destroy_slab_caches();
  out_compressors:
        jffs2_compressors_exit();
+#ifdef CONFIG_JFFS2_PROC
+        jffs2_proc_exit();
+#endif
  out:
        return ret;
 }
@@ -338,6 +348,9 @@ static void __exit exit_jffs2_fs(void)
        unregister_filesystem(&jffs2_fs_type);
        jffs2_destroy_slab_caches();
        jffs2_compressors_exit();
+#ifdef CONFIG_JFFS2_PROC
+        jffs2_proc_exit();
+#endif
        kmem_cache_destroy(jffs2_inode_cachep);
 }