Commit 35a5fe69 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman

kobject: remove kset from sysfs immediately in kset_unregister()

There's no "unlink from sysfs" interface for ksets, so I think callers of
kset_unregister() expect the kset to be removed from sysfs immediately,
without waiting for the last reference to be released.

This patch makes the sysfs removal happen immediately, so the caller may
create a new kset with the same name as soon as kset_unregister() returns.
Without this, every caller has to call "kobject_del(&kset->kobj)" first
unless it knows it will never create a new kset with the same name.

This sometimes shows up on module unload and reload, where the reload fails
because it tries to create a kobject with the same name as one from the
original load that still exists.  CONFIG_DEBUG_KOBJECT_RELEASE=y makes this
problem easier to hit.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89c86a64
...@@ -342,7 +342,10 @@ kset use: ...@@ -342,7 +342,10 @@ kset use:
When you are finished with the kset, call: When you are finished with the kset, call:
void kset_unregister(struct kset *kset); void kset_unregister(struct kset *kset);
to destroy it. to destroy it. This removes the kset from sysfs and decrements its reference
count. When the reference count goes to zero, the kset will be released.
Because other references to the kset may still exist, the release may happen
after kset_unregister() returns.
An example of using a kset can be seen in the An example of using a kset can be seen in the
samples/kobject/kset-example.c file in the kernel tree. samples/kobject/kset-example.c file in the kernel tree.
......
...@@ -855,6 +855,7 @@ void kset_unregister(struct kset *k) ...@@ -855,6 +855,7 @@ void kset_unregister(struct kset *k)
{ {
if (!k) if (!k)
return; return;
kobject_del(&k->kobj);
kobject_put(&k->kobj); kobject_put(&k->kobj);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment