Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / fs / configfs / mount.c

diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index f6c2858..da94e41 100644 (file)
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -145,19 +145,13 @@ static int __init configfs_init(void)
        if (!config_kobj)
                goto out2;
 
-       err = configfs_inode_init();
-       if (err)
-               goto out3;
-
        err = register_filesystem(&configfs_fs_type);
        if (err)
-               goto out4;
+               goto out3;
 
        return 0;
-out4:
-       pr_err("Unable to register filesystem!\n");
-       configfs_inode_exit();
 out3:
+       pr_err("Unable to register filesystem!\n");
        kobject_put(config_kobj);
 out2:
        kmem_cache_destroy(configfs_dir_cachep);
@@ -172,7 +166,6 @@ static void __exit configfs_exit(void)
        kobject_put(config_kobj);
        kmem_cache_destroy(configfs_dir_cachep);
        configfs_dir_cachep = NULL;
-       configfs_inode_exit();
 }
 
 MODULE_AUTHOR("Oracle");