diff options
Diffstat (limited to 'fs/sysfs/sysfs.h')
-rw-r--r-- | fs/sysfs/sysfs.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index af4c4e7482ac..ca52e7b9d8f8 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h | |||
@@ -89,9 +89,7 @@ static inline unsigned int sysfs_type(struct sysfs_dirent *sd) | |||
89 | */ | 89 | */ |
90 | struct sysfs_addrm_cxt { | 90 | struct sysfs_addrm_cxt { |
91 | struct sysfs_dirent *parent_sd; | 91 | struct sysfs_dirent *parent_sd; |
92 | struct inode *parent_inode; | ||
93 | struct sysfs_dirent *removed; | 92 | struct sysfs_dirent *removed; |
94 | int cnt; | ||
95 | }; | 93 | }; |
96 | 94 | ||
97 | /* | 95 | /* |
@@ -105,7 +103,6 @@ extern struct kmem_cache *sysfs_dir_cachep; | |||
105 | * dir.c | 103 | * dir.c |
106 | */ | 104 | */ |
107 | extern struct mutex sysfs_mutex; | 105 | extern struct mutex sysfs_mutex; |
108 | extern struct mutex sysfs_rename_mutex; | ||
109 | extern spinlock_t sysfs_assoc_lock; | 106 | extern spinlock_t sysfs_assoc_lock; |
110 | 107 | ||
111 | extern const struct file_operations sysfs_dir_operations; | 108 | extern const struct file_operations sysfs_dir_operations; |
@@ -133,6 +130,9 @@ int sysfs_create_subdir(struct kobject *kobj, const char *name, | |||
133 | struct sysfs_dirent **p_sd); | 130 | struct sysfs_dirent **p_sd); |
134 | void sysfs_remove_subdir(struct sysfs_dirent *sd); | 131 | void sysfs_remove_subdir(struct sysfs_dirent *sd); |
135 | 132 | ||
133 | int sysfs_rename(struct sysfs_dirent *sd, | ||
134 | struct sysfs_dirent *new_parent_sd, const char *new_name); | ||
135 | |||
136 | static inline struct sysfs_dirent *__sysfs_get(struct sysfs_dirent *sd) | 136 | static inline struct sysfs_dirent *__sysfs_get(struct sysfs_dirent *sd) |
137 | { | 137 | { |
138 | if (sd) { | 138 | if (sd) { |
@@ -155,7 +155,10 @@ static inline void __sysfs_put(struct sysfs_dirent *sd) | |||
155 | */ | 155 | */ |
156 | struct inode *sysfs_get_inode(struct sysfs_dirent *sd); | 156 | struct inode *sysfs_get_inode(struct sysfs_dirent *sd); |
157 | void sysfs_delete_inode(struct inode *inode); | 157 | void sysfs_delete_inode(struct inode *inode); |
158 | int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); | ||
159 | int sysfs_permission(struct inode *inode, int mask); | ||
158 | int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); | 160 | int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); |
161 | int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat); | ||
159 | int sysfs_setxattr(struct dentry *dentry, const char *name, const void *value, | 162 | int sysfs_setxattr(struct dentry *dentry, const char *name, const void *value, |
160 | size_t size, int flags); | 163 | size_t size, int flags); |
161 | int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name); | 164 | int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name); |