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 /fs/sysfs/dir.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 'fs/sysfs/dir.c')
-rw-r--r-- | fs/sysfs/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 4ad9422566a8..e301a1207b60 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
@@ -318,7 +318,6 @@ struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type) | |||
318 | 318 | ||
319 | atomic_set(&sd->s_count, 1); | 319 | atomic_set(&sd->s_count, 1); |
320 | atomic_set(&sd->s_active, 0); | 320 | atomic_set(&sd->s_active, 0); |
321 | atomic_set(&sd->s_event, 1); | ||
322 | 321 | ||
323 | sd->s_name = name; | 322 | sd->s_name = name; |
324 | sd->s_mode = mode; | 323 | sd->s_mode = mode; |