1 files changed, 6 insertions, 7 deletions

diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index 374ddbd6648d..13300466464b 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -128,7 +128,7 @@ void configfs_release_fs(void)
 }
 
 
-static decl_subsys(config, NULL);
+static struct kobject *config_kobj;
 
 static int __init configfs_init(void)
 {
@@ -140,9 +140,8 @@ static int __init configfs_init(void)
         if (!configfs_dir_cachep)
                 goto out;
 
-        config_subsys.kobj.kset = &kernel_subsys;
-        err = subsystem_register(&config_subsys);
-        if (err) {
+        config_kobj = kobject_create_and_add("config", &kernel_subsys.kobj);
+        if (!config_kobj) {
                 kmem_cache_destroy(configfs_dir_cachep);
                 configfs_dir_cachep = NULL;
                 goto out;
@@ -151,7 +150,7 @@ static int __init configfs_init(void)
         err = register_filesystem(&configfs_fs_type);
         if (err) {
                 printk(KERN_ERR "configfs: Unable to register filesystem!\n");
-                subsystem_unregister(&config_subsys);
+                kobject_unregister(config_kobj);
                 kmem_cache_destroy(configfs_dir_cachep);
                 configfs_dir_cachep = NULL;
                 goto out;
@@ -160,7 +159,7 @@ static int __init configfs_init(void)
         err = configfs_inode_init();
         if (err) {
                 unregister_filesystem(&configfs_fs_type);
-                subsystem_unregister(&config_subsys);
+                kobject_unregister(config_kobj);
                 kmem_cache_destroy(configfs_dir_cachep);
                 configfs_dir_cachep = NULL;
         }
@@ -171,7 +170,7 @@ out:
 static void __exit configfs_exit(void)
 {
         unregister_filesystem(&configfs_fs_type);
-        subsystem_unregister(&config_subsys);
+        kobject_unregister(config_kobj);
         kmem_cache_destroy(configfs_dir_cachep);
         configfs_dir_cachep = NULL;
         configfs_inode_exit();