Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[powerpc.git] / fs / configfs / mount.c

diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index b00d962..3bf0278 100644 (file)
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -136,7 +136,7 @@ static int __init configfs_init(void)
 
        configfs_dir_cachep = kmem_cache_create("configfs_dir_cache",
                                                sizeof(struct configfs_dirent),
-                                               0, 0, NULL, NULL);
+                                               0, 0, NULL);
        if (!configfs_dir_cachep)
                goto out;
 
@@ -154,8 +154,16 @@ static int __init configfs_init(void)
                subsystem_unregister(&config_subsys);
                kmem_cache_destroy(configfs_dir_cachep);
                configfs_dir_cachep = NULL;
+               goto out;
        }
 
+       err = configfs_inode_init();
+       if (err) {
+               unregister_filesystem(&configfs_fs_type);
+               subsystem_unregister(&config_subsys);
+               kmem_cache_destroy(configfs_dir_cachep);
+               configfs_dir_cachep = NULL;
+       }
 out:
        return err;
 }
@@ -166,6 +174,7 @@ static void __exit configfs_exit(void)
        subsystem_unregister(&config_subsys);
        kmem_cache_destroy(configfs_dir_cachep);
        configfs_dir_cachep = NULL;
+       configfs_inode_exit();
 }
 
 MODULE_AUTHOR("Oracle");