Commit faef2b6c9960b5ae288899f461a2218ec6bb7928
1 parent
5b91aca0bd
Exists in
master
and in
6 other branches
sysfs: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 4 changed files with 5 additions and 5 deletions Side-by-side Diff
Documentation/filesystems/sysfs.txt
fs/sysfs/file.c
... | ... | @@ -518,7 +518,7 @@ |
518 | 518 | } |
519 | 519 | |
520 | 520 | int sysfs_add_file_mode(struct sysfs_dirent *dir_sd, |
521 | - const struct attribute *attr, int type, mode_t amode) | |
521 | + const struct attribute *attr, int type, umode_t amode) | |
522 | 522 | { |
523 | 523 | umode_t mode = (amode & S_IALLUGO) | S_IFREG; |
524 | 524 | struct sysfs_addrm_cxt acxt; |
fs/sysfs/inode.c
... | ... | @@ -187,7 +187,7 @@ |
187 | 187 | return error; |
188 | 188 | } |
189 | 189 | |
190 | -static inline void set_default_inode_attr(struct inode * inode, mode_t mode) | |
190 | +static inline void set_default_inode_attr(struct inode * inode, umode_t mode) | |
191 | 191 | { |
192 | 192 | inode->i_mode = mode; |
193 | 193 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
fs/sysfs/sysfs.h
... | ... | @@ -79,7 +79,7 @@ |
79 | 79 | }; |
80 | 80 | |
81 | 81 | unsigned int s_flags; |
82 | - unsigned short s_mode; | |
82 | + umode_t s_mode; | |
83 | 83 | ino_t s_ino; |
84 | 84 | struct sysfs_inode_attrs *s_iattr; |
85 | 85 | }; |
... | ... | @@ -229,7 +229,7 @@ |
229 | 229 | const struct attribute *attr, int type); |
230 | 230 | |
231 | 231 | int sysfs_add_file_mode(struct sysfs_dirent *dir_sd, |
232 | - const struct attribute *attr, int type, mode_t amode); | |
232 | + const struct attribute *attr, int type, umode_t amode); | |
233 | 233 | /* |
234 | 234 | * bin.c |
235 | 235 | */ |