diff options
author | Tejun Heo <htejun@gmail.com> | 2007-09-20 03:05:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:51:11 -0400 |
commit | a4e8b912541d5372ae049a3b7c1979968e52c40b (patch) | |
tree | a95937748b6216f914abe55ed47c2627e7856bf7 /lib/kobject.c | |
parent | 85a4ffad3de77177591f7c2c18c26c3c8dd28bff (diff) |
sysfs: move sysfs file poll implementation to sysfs_open_dirent
Sysfs file poll implementation is scattered over sysfs and kobject.
Event numbering is done in sysfs_dirent but wait itself is done on
kobject. This not only unecessarily bloats both kobject and
sysfs_dirent but is also buggy - if a sysfs_dirent is removed while
there still are pollers, the associaton betwen the kobject and
sysfs_dirent breaks and kobject may be freed with the pollers still
sleeping on it.
This patch moves whole poll implementation into sysfs_open_dirent.
Each time a sysfs_open_dirent is created, event number restarts from 1
and pollers sleep on sysfs_open_dirent. As event sequence number is
meaningless without any open file and pollers should have open file
and thus sysfs_open_dirent, this ephemeral event counting works and is
a saner implementation.
This patch fixes the dnagling sleepers bug and reduces the sizes of
kobject and sysfs_dirent by one pointer.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib/kobject.c')
-rw-r--r-- | lib/kobject.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index e8181d3cec34..fc6db6b4bfc5 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
@@ -131,7 +131,6 @@ void kobject_init(struct kobject * kobj) | |||
131 | return; | 131 | return; |
132 | kref_init(&kobj->kref); | 132 | kref_init(&kobj->kref); |
133 | INIT_LIST_HEAD(&kobj->entry); | 133 | INIT_LIST_HEAD(&kobj->entry); |
134 | init_waitqueue_head(&kobj->poll); | ||
135 | kobj->kset = kset_get(kobj->kset); | 134 | kobj->kset = kset_get(kobj->kset); |
136 | } | 135 | } |
137 | 136 | ||