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

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

kset: convert kernel_subsys to use kset_create 



Dynamically create the kset instead of declaring it statically.  We also
rename kernel_subsys to kernel_kset to catch all users of this symbol
with a build error instead of an easy-to-ignore build warning.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e5e38a86

fs/configfs/mount.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int __init configfs_init(void) 
	if (!configfs_dir_cachep)

		goto out;



	config_kobj = kobject_create_and_add("config", &kernel_subsys.kobj);

	config_kobj = kobject_create_and_add("config", &kernel_kset->kobj);

	if (!config_kobj) {

		kmem_cache_destroy(configfs_dir_cachep);

		configfs_dir_cachep = NULL;

fs/debugfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int __init debugfs_init(void) 
{

	int retval;



	debug_kobj = kobject_create_and_add("debug", &kernel_subsys.kobj);

	debug_kobj = kobject_create_and_add("debug", &kernel_kset->kobj);

	if (!debug_kobj)

		return -EINVAL;

fs/dlm/lockspace.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int dlm_lockspace_init(void) 
	INIT_LIST_HEAD(&lslist);

	spin_lock_init(&lslist_lock);



	dlm_kset = kset_create_and_add("dlm", NULL, &kernel_subsys.kobj);

	dlm_kset = kset_create_and_add("dlm", NULL, &kernel_kset->kobj);

	if (!dlm_kset) {

		printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);

		return -ENOMEM;

fs/gfs2/locking/dlm/sysfs.c

+1 −2
Original line number Diff line number Diff line
@@ -219,8 +219,7 @@ void gdlm_kobject_release(struct gdlm_ls *ls) 


int gdlm_sysfs_init(void)

{

	gdlm_kset = kset_create_and_add("lock_dlm", NULL,

					&kernel_subsys.kobj);

	gdlm_kset = kset_create_and_add("lock_dlm", NULL, &kernel_kset->kobj);

	if (!gdlm_kset) {

		printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);

		return -ENOMEM;

include/linux/kobject.h

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ struct kset _name##_subsys = { \ 
	.uevent_ops =_uevent_ops, \

}



/* The global /sys/kernel/ subsystem for people to chain off of */

extern struct kset kernel_subsys;

/* The global /sys/kernel/ kset for people to chain off of */

extern struct kset *kernel_kset;

/* The global /sys/hypervisor/ subsystem  */

extern struct kset hypervisor_subsys;