diff options
Diffstat (limited to 'include/linux/sysfs.h')
-rw-r--r-- | include/linux/sysfs.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 2a6df6444e69..4c43030fae5d 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h | |||
@@ -19,6 +19,7 @@ struct kobject; | |||
19 | struct module; | 19 | struct module; |
20 | struct nameidata; | 20 | struct nameidata; |
21 | struct dentry; | 21 | struct dentry; |
22 | struct sysfs_dirent; | ||
22 | 23 | ||
23 | /* FIXME | 24 | /* FIXME |
24 | * The *owner field is no longer used, but leave around | 25 | * The *owner field is no longer used, but leave around |
@@ -92,13 +93,14 @@ extern int sysfs_schedule_callback(struct kobject *kobj, | |||
92 | void (*func)(void *), void *data, struct module *owner); | 93 | void (*func)(void *), void *data, struct module *owner); |
93 | 94 | ||
94 | extern int __must_check | 95 | extern int __must_check |
95 | sysfs_create_dir(struct kobject *, struct dentry *); | 96 | sysfs_create_dir(struct kobject *kobj, struct sysfs_dirent *shadow_parent_sd); |
96 | 97 | ||
97 | extern void | 98 | extern void |
98 | sysfs_remove_dir(struct kobject *); | 99 | sysfs_remove_dir(struct kobject *); |
99 | 100 | ||
100 | extern int __must_check | 101 | extern int __must_check |
101 | sysfs_rename_dir(struct kobject *, struct dentry *, const char *new_name); | 102 | sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd, |
103 | const char *new_name); | ||
102 | 104 | ||
103 | extern int __must_check | 105 | extern int __must_check |
104 | sysfs_move_dir(struct kobject *, struct kobject *); | 106 | sysfs_move_dir(struct kobject *, struct kobject *); |
@@ -138,8 +140,8 @@ void sysfs_notify(struct kobject * k, char *dir, char *attr); | |||
138 | 140 | ||
139 | extern int sysfs_make_shadowed_dir(struct kobject *kobj, | 141 | extern int sysfs_make_shadowed_dir(struct kobject *kobj, |
140 | void * (*follow_link)(struct dentry *, struct nameidata *)); | 142 | void * (*follow_link)(struct dentry *, struct nameidata *)); |
141 | extern struct dentry *sysfs_create_shadow_dir(struct kobject *kobj); | 143 | extern struct sysfs_dirent *sysfs_create_shadow_dir(struct kobject *kobj); |
142 | extern void sysfs_remove_shadow_dir(struct dentry *dir); | 144 | extern void sysfs_remove_shadow_dir(struct sysfs_dirent *shadow_sd); |
143 | 145 | ||
144 | extern int __must_check sysfs_init(void); | 146 | extern int __must_check sysfs_init(void); |
145 | 147 | ||
@@ -151,7 +153,8 @@ static inline int sysfs_schedule_callback(struct kobject *kobj, | |||
151 | return -ENOSYS; | 153 | return -ENOSYS; |
152 | } | 154 | } |
153 | 155 | ||
154 | static inline int sysfs_create_dir(struct kobject * k, struct dentry *shadow) | 156 | static inline int sysfs_create_dir(struct kobject *kobj, |
157 | struct sysfs_dirent *shadow_parent_sd) | ||
155 | { | 158 | { |
156 | return 0; | 159 | return 0; |
157 | } | 160 | } |
@@ -161,9 +164,9 @@ static inline void sysfs_remove_dir(struct kobject * k) | |||
161 | ; | 164 | ; |
162 | } | 165 | } |
163 | 166 | ||
164 | static inline int sysfs_rename_dir(struct kobject * k, | 167 | static inline int sysfs_rename_dir(struct kobject *kobj, |
165 | struct dentry *new_parent, | 168 | struct sysfs_dirent *new_parent_sd, |
166 | const char *new_name) | 169 | const char *new_name) |
167 | { | 170 | { |
168 | return 0; | 171 | return 0; |
169 | } | 172 | } |