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

kobject: convert kernel_kset to be a kobject 



kernel_kset does not need to be a kset, but a much simpler kobject now
that we have kobj_attributes.

We also rename kernel_kset to kernel_kobj 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 5c03c7ab

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_kset->kobj);

	config_kobj = kobject_create_and_add("config", kernel_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_kset->kobj);

	debug_kobj = kobject_create_and_add("debug", kernel_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_kset->kobj);

	dlm_kset = kset_create_and_add("dlm", NULL, kernel_kobj);

	if (!dlm_kset) {

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

		return -ENOMEM;

fs/gfs2/locking/dlm/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +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_kset->kobj);

	gdlm_kset = kset_create_and_add("lock_dlm", NULL, kernel_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
@@ -198,8 +198,8 @@ extern struct kobject * kset_find_obj(struct kset *, const char *); 
#define set_kset_name(str)	.kset = { .kobj = { .k_name = str } }





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

extern struct kset *kernel_kset;

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

extern struct kobject *kernel_kobj;

/* The global /sys/hypervisor/ kobject for people to chain off of */

extern struct kobject *hypervisor_kobj;

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE