Commit faef2b6c authored by Al Viro's avatar Al Viro
Browse files

sysfs: propagate umode_t 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5b91aca0

Documentation/filesystems/sysfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ An attribute definition is simply: 
struct attribute {

        char                    * name;

        struct module		*owner;

        mode_t                  mode;

        umode_t                 mode;

};

fs/sysfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ int sysfs_attr_ns(struct kobject *kobj, const struct attribute *attr, 
}



int sysfs_add_file_mode(struct sysfs_dirent *dir_sd,

			const struct attribute *attr, int type, mode_t amode)

			const struct attribute *attr, int type, umode_t amode)

{

	umode_t mode = (amode & S_IALLUGO) | S_IFREG;

	struct sysfs_addrm_cxt acxt;

fs/sysfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int sysfs_setxattr(struct dentry *dentry, const char *name, const void *value, 
	return error;

}



static inline void set_default_inode_attr(struct inode * inode, mode_t mode)

static inline void set_default_inode_attr(struct inode * inode, umode_t mode)

{

	inode->i_mode = mode;

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

fs/sysfs/sysfs.h

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct sysfs_dirent { 
	};



	unsigned int		s_flags;

	unsigned short		s_mode;

	umode_t 		s_mode;

	ino_t			s_ino;

	struct sysfs_inode_attrs *s_iattr;

};
@@ -229,7 +229,7 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, 
		   const struct attribute *attr, int type);



int sysfs_add_file_mode(struct sysfs_dirent *dir_sd,

			const struct attribute *attr, int type, mode_t amode);

			const struct attribute *attr, int type, umode_t amode);

/*

 * bin.c

 */