Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9548906b authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

xattr: Constify ->name member of "struct xattr". 



Since everybody sets kstrdup()ed constant string to "struct xattr"->name but
nobody modifies "struct xattr"->name , we can omit kstrdup() and its failure
checking by constifying ->name member of "struct xattr".

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reviewed-by: Joel Becker <jlbec@evilplan.org> [ocfs2]
Acked-by: default avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
Acked-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Acked-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Reviewed-by: default avatarPaul Moore <paul@paul-moore.com>
Tested-by: default avatarPaul Moore <paul@paul-moore.com>
Acked-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent be0306bc

fs/ocfs2/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ enum ocfs2_xattr_type { 


struct ocfs2_security_xattr_info {

	int enable;

	char *name;

	const char *name;

	void *value;

	size_t value_len;

};

include/linux/security.h

+4 −4
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ struct security_operations { 
	int (*inode_alloc_security) (struct inode *inode);

	void (*inode_free_security) (struct inode *inode);

	int (*inode_init_security) (struct inode *inode, struct inode *dir,

				    const struct qstr *qstr, char **name,

				    const struct qstr *qstr, const char **name,

				    void **value, size_t *len);

	int (*inode_create) (struct inode *dir,

			     struct dentry *dentry, umode_t mode);
@@ -1770,7 +1770,7 @@ int security_inode_init_security(struct inode *inode, struct inode *dir, 
				 const struct qstr *qstr,

				 initxattrs initxattrs, void *fs_data);

int security_old_inode_init_security(struct inode *inode, struct inode *dir,

				     const struct qstr *qstr, char **name,

				     const struct qstr *qstr, const char **name,

				     void **value, size_t *len);

int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);

int security_inode_link(struct dentry *old_dentry, struct inode *dir,
@@ -2094,8 +2094,8 @@ static inline int security_inode_init_security(struct inode *inode, 
static inline int security_old_inode_init_security(struct inode *inode,

						   struct inode *dir,

						   const struct qstr *qstr,

						   char **name, void **value,

						   size_t *len)

						   const char **name,

						   void **value, size_t *len)

{

	return -EOPNOTSUPP;

}

include/linux/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct xattr_handler { 
};



struct xattr {

	char *name;

	const char *name;

	void *value;

	size_t value_len;

};

include/uapi/linux/reiserfs_xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct reiserfs_xattr_header { 
};



struct reiserfs_security_handle {

	char *name;

	const char *name;

	void *value;

	size_t length;

};

security/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void cap_inode_free_security(struct inode *inode) 
}



static int cap_inode_init_security(struct inode *inode, struct inode *dir,

				   const struct qstr *qstr, char **name,

				   const struct qstr *qstr, const char **name,

				   void **value, size_t *len)

{

	return -EOPNOTSUPP;