Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3794491d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

kobject: convert configfs to use kobject_create 



We don't need a kset here, a simple kobject will do just fine, so
dynamically create the kobject and use it.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 191e186b

fs/configfs/mount.c

+6 −7
Original line number Diff line number Diff line
@@ -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 @@ static int __init configfs_init(void) 
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();