diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 14:41:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 14:41:30 -0500 |
commit | a7538a7f87826fb5cacc6959f00dfa9fba6f4b15 (patch) | |
tree | a0fef9252200a78634f0fa4eaa714c7a40e802b9 /fs/sysfs | |
parent | 92320cec611d4ed44a9bd635727d61f6caa669a7 (diff) | |
parent | dfff0a0671baf4e69fc676bf8150635407548288 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Revert "Driver core: let request_module() send a /sys/modules/kmod/-uevent"
Driver core: fix error by cleanup up symlinks properly
make kernel/kmod.c:kmod_mk static
power management: fix struct layout and docs
power management: no valid states w/o pm_ops
Driver core: more fallout from class_device changes for pcmcia
sysfs: move struct sysfs_dirent to private header
driver core: refcounting fix
Driver core: remove class_device_rename
Diffstat (limited to 'fs/sysfs')
-rw-r--r-- | fs/sysfs/sysfs.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index d976b0005549..a77c57e5a6d5 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h | |||
@@ -1,3 +1,14 @@ | |||
1 | struct sysfs_dirent { | ||
2 | atomic_t s_count; | ||
3 | struct list_head s_sibling; | ||
4 | struct list_head s_children; | ||
5 | void * s_element; | ||
6 | int s_type; | ||
7 | umode_t s_mode; | ||
8 | struct dentry * s_dentry; | ||
9 | struct iattr * s_iattr; | ||
10 | atomic_t s_event; | ||
11 | }; | ||
1 | 12 | ||
2 | extern struct vfsmount * sysfs_mount; | 13 | extern struct vfsmount * sysfs_mount; |
3 | extern struct kmem_cache *sysfs_dir_cachep; | 14 | extern struct kmem_cache *sysfs_dir_cachep; |