Skip to content

Commit

Permalink
kobject: grab the kset reference in kobject_add, not kobject_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jan 25, 2008
1 parent d76e15f commit cfb36ff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/kobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ void kobject_init(struct kobject * kobj)
return;
kref_init(&kobj->kref);
INIT_LIST_HEAD(&kobj->entry);
kobj->kset = kset_get(kobj->kset);
}


Expand Down Expand Up @@ -184,7 +183,7 @@ int kobject_add(struct kobject * kobj)
kobj->kset ? kobject_name(&kobj->kset->kobj) : "<NULL>" );

if (kobj->kset) {
spin_lock(&kobj->kset->list_lock);
kobj->kset = kset_get(kobj->kset);

if (!parent) {
parent = kobject_get(&kobj->kset->kobj);
Expand All @@ -196,7 +195,8 @@ int kobject_add(struct kobject * kobj)
kobject_get(parent);
}

list_add_tail(&kobj->entry,&kobj->kset->list);
spin_lock(&kobj->kset->list_lock);
list_add_tail(&kobj->entry, &kobj->kset->list);
spin_unlock(&kobj->kset->list_lock);
kobj->parent = parent;
}
Expand Down

0 comments on commit cfb36ff

Please sign in to comment.