Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205525
b: refs/heads/master
c: 49c1940
h: refs/heads/master
i:
  205523: d0ea5c3
v: v3
  • Loading branch information
Jean Delvare authored and Greg Kroah-Hartman committed Aug 5, 2010
1 parent 7403760 commit fc8ea0a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3317fad5e9c741e758707879c68e20de2cb08f87
refs/heads/master: 49c19400f60bbe362202d7e7b3e68cc66040d0fa
3 changes: 2 additions & 1 deletion trunk/fs/sysfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,8 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group);
* @mode: file permissions.
*
*/
int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode)
int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr,
mode_t mode)
{
struct sysfs_dirent *sd;
struct iattr newattrs;
Expand Down
6 changes: 3 additions & 3 deletions trunk/include/linux/sysfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ int __must_check sysfs_create_file(struct kobject *kobj,
const struct attribute *attr);
int __must_check sysfs_create_files(struct kobject *kobj,
const struct attribute **attr);
int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr,
mode_t mode);
int __must_check sysfs_chmod_file(struct kobject *kobj,
const struct attribute *attr, mode_t mode);
void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr);

Expand Down Expand Up @@ -225,7 +225,7 @@ static inline int sysfs_create_files(struct kobject *kobj,
}

static inline int sysfs_chmod_file(struct kobject *kobj,
struct attribute *attr, mode_t mode)
const struct attribute *attr, mode_t mode)
{
return 0;
}
Expand Down

0 comments on commit fc8ea0a

Please sign in to comment.