lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kobject: grab the kset reference in kobject_add, not kobject_init

Browse Source 
kobject_init should not be grabing any references, but only initializing
the object.  This patch fixes this, and makes the lock hold-time shorter
for when a kset is present in the kobject.

The current kernel tree has been audited to verify that this change
should be safe.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2007-11-28 10:46:22 -08:00
parent d76e15fb20
commit cfb36fff45
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/kobject.c
View File

@@ -133,7 +133,6 @@ void kobject_init(struct kobject * kobj)
return; return;
kref_init(&kobj->kref); kref_init(&kobj->kref);
INIT_LIST_HEAD(&kobj->entry); INIT_LIST_HEAD(&kobj->entry);
kobj->kset = kset_get(kobj->kset);
} }
@@ -184,7 +183,7 @@ int kobject_add(struct kobject * kobj)
kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>" ); kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>" );
if (kobj->kset) { if (kobj->kset) {
spin_lock(&kobj->kset->list_lock); kobj->kset = kset_get(kobj->kset);
if (!parent) { if (!parent) {
parent = kobject_get(&kobj->kset->kobj); parent = kobject_get(&kobj->kset->kobj);
@@ -196,6 +195,7 @@ int kobject_add(struct kobject * kobj)
kobject_get(parent); kobject_get(parent);
} }
spin_lock(&kobj->kset->list_lock);
list_add_tail(&kobj->entry, &kobj->kset->list); list_add_tail(&kobj->entry, &kobj->kset->list);
spin_unlock(&kobj->kset->list_lock); spin_unlock(&kobj->kset->list_lock);
kobj->parent = parent; kobj->parent = parent;