aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-07-02 10:54:05 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-05 16:53:34 -0400
commit49c19400f60bbe362202d7e7b3e68cc66040d0fa (patch)
treec514cf3270a81a199bac36feee020a98d05db9c5
parent3317fad5e9c741e758707879c68e20de2cb08f87 (diff)
sysfs: sysfs_chmod_file's attr can be const
sysfs_chmod_file doesn't change the attribute it operates on, so this attribute can be marked const. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/sysfs/file.c3
-rw-r--r--include/linux/sysfs.h6
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 1beaa739d0a6..1b27b5688f62 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -593,7 +593,8 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group);
593 * @mode: file permissions. 593 * @mode: file permissions.
594 * 594 *
595 */ 595 */
596int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode) 596int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr,
597 mode_t mode)
597{ 598{
598 struct sysfs_dirent *sd; 599 struct sysfs_dirent *sd;
599 struct iattr newattrs; 600 struct iattr newattrs;
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index f2694eb4dd3d..8bf06b64487c 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -136,8 +136,8 @@ int __must_check sysfs_create_file(struct kobject *kobj,
136 const struct attribute *attr); 136 const struct attribute *attr);
137int __must_check sysfs_create_files(struct kobject *kobj, 137int __must_check sysfs_create_files(struct kobject *kobj,
138 const struct attribute **attr); 138 const struct attribute **attr);
139int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, 139int __must_check sysfs_chmod_file(struct kobject *kobj,
140 mode_t mode); 140 const struct attribute *attr, mode_t mode);
141void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr); 141void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
142void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr); 142void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr);
143 143
@@ -225,7 +225,7 @@ static inline int sysfs_create_files(struct kobject *kobj,
225} 225}
226 226
227static inline int sysfs_chmod_file(struct kobject *kobj, 227static inline int sysfs_chmod_file(struct kobject *kobj,
228 struct attribute *attr, mode_t mode) 228 const struct attribute *attr, mode_t mode)
229{ 229{
230 return 0; 230 return 0;
231} 231}