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

Commit a9273ca5 authored by Dave Chinner's avatar Dave Chinner
Browse files

xfs: convert attr to use unsigned names 



To be consistent with the directory code, the attr code should use
unsigned names. Convert the names from the vfs at the highest level
to unsigned, and ænsure they are consistenly used as unsigned down
to disk.

Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent b9c48649

fs/xfs/linux-2.6/xfs_acl.c

+6 −5
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ xfs_get_acl(struct inode *inode, int type) 
	struct posix_acl *acl;

	struct xfs_acl *xfs_acl;

	int len = sizeof(struct xfs_acl);

	char *ea_name;

	unsigned char *ea_name;

	int error;



	acl = get_cached_acl(inode, type);
@@ -133,7 +133,8 @@ xfs_get_acl(struct inode *inode, int type) 
	if (!xfs_acl)

		return ERR_PTR(-ENOMEM);



	error = -xfs_attr_get(ip, ea_name, (char *)xfs_acl, &len, ATTR_ROOT);

	error = -xfs_attr_get(ip, ea_name, (unsigned char *)xfs_acl,

							&len, ATTR_ROOT);

	if (error) {

		/*

		 * If the attribute doesn't exist make sure we have a negative
@@ -162,7 +163,7 @@ STATIC int 
xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)

{

	struct xfs_inode *ip = XFS_I(inode);

	char *ea_name;

	unsigned char *ea_name;

	int error;



	if (S_ISLNK(inode->i_mode))
@@ -194,7 +195,7 @@ xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) 
			(sizeof(struct xfs_acl_entry) *

			 (XFS_ACL_MAX_ENTRIES - acl->a_count));



		error = -xfs_attr_set(ip, ea_name, (char *)xfs_acl,

		error = -xfs_attr_set(ip, ea_name, (unsigned char *)xfs_acl,

				len, ATTR_ROOT);



		kfree(xfs_acl);
@@ -262,7 +263,7 @@ xfs_set_mode(struct inode *inode, mode_t mode) 
}



static int

xfs_acl_exists(struct inode *inode, char *name)

xfs_acl_exists(struct inode *inode, unsigned char *name)

{

	int len = sizeof(struct xfs_acl);

fs/xfs/linux-2.6/xfs_ioctl.c

+9 −9
Original line number Diff line number Diff line
@@ -447,12 +447,12 @@ xfs_attrlist_by_handle( 
int

xfs_attrmulti_attr_get(

	struct inode		*inode,

	char			*name,

	char			__user *ubuf,

	unsigned char		*name,

	unsigned char		__user *ubuf,

	__uint32_t		*len,

	__uint32_t		flags)

{

	char			*kbuf;

	unsigned char		*kbuf;

	int			error = EFAULT;



	if (*len > XATTR_SIZE_MAX)
@@ -476,12 +476,12 @@ xfs_attrmulti_attr_get( 
int

xfs_attrmulti_attr_set(

	struct inode		*inode,

	char			*name,

	const char		__user *ubuf,

	unsigned char		*name,

	const unsigned char	__user *ubuf,

	__uint32_t		len,

	__uint32_t		flags)

{

	char			*kbuf;

	unsigned char		*kbuf;

	int			error = EFAULT;



	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
@@ -501,7 +501,7 @@ xfs_attrmulti_attr_set( 
int

xfs_attrmulti_attr_remove(

	struct inode		*inode,

	char			*name,

	unsigned char		*name,

	__uint32_t		flags)

{

	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
@@ -519,7 +519,7 @@ xfs_attrmulti_by_handle( 
	xfs_fsop_attrmulti_handlereq_t am_hreq;

	struct dentry		*dentry;

	unsigned int		i, size;

	char			*attr_name;

	unsigned char		*attr_name;



	if (!capable(CAP_SYS_ADMIN))

		return -XFS_ERROR(EPERM);
@@ -547,7 +547,7 @@ xfs_attrmulti_by_handle( 


	error = 0;

	for (i = 0; i < am_hreq.opcount; i++) {

		ops[i].am_error = strncpy_from_user(attr_name,

		ops[i].am_error = strncpy_from_user((char *)attr_name,

				ops[i].am_attrname, MAXNAMELEN);

		if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN)

			error = -ERANGE;

fs/xfs/linux-2.6/xfs_ioctl.h

+6 −6
Original line number Diff line number Diff line
@@ -45,23 +45,23 @@ xfs_readlink_by_handle( 
extern int

xfs_attrmulti_attr_get(

	struct inode		*inode,

	char			*name,

	char			__user *ubuf,

	unsigned char		*name,

	unsigned char		__user *ubuf,

	__uint32_t		*len,

	__uint32_t		flags);



extern int

xfs_attrmulti_attr_set(

	struct inode		*inode,

	char			*name,

	const char		__user *ubuf,

	unsigned char		*name,

	const unsigned char	__user *ubuf,

	__uint32_t		len,

	__uint32_t		flags);



extern int

xfs_attrmulti_attr_remove(

	struct inode		*inode,

	char			*name,

	unsigned char		*name,

	__uint32_t		flags);



extern struct dentry *

fs/xfs/linux-2.6/xfs_ioctl32.c

+2 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ xfs_compat_attrmulti_by_handle( 
	compat_xfs_fsop_attrmulti_handlereq_t	am_hreq;

	struct dentry				*dentry;

	unsigned int				i, size;

	char					*attr_name;

	unsigned char				*attr_name;



	if (!capable(CAP_SYS_ADMIN))

		return -XFS_ERROR(EPERM);
@@ -440,7 +440,7 @@ xfs_compat_attrmulti_by_handle( 


	error = 0;

	for (i = 0; i < am_hreq.opcount; i++) {

		ops[i].am_error = strncpy_from_user(attr_name,

		ops[i].am_error = strncpy_from_user((char *)attr_name,

				compat_ptr(ops[i].am_attrname),

				MAXNAMELEN);

		if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN)

fs/xfs/linux-2.6/xfs_iops.c

+2 −2
Original line number Diff line number Diff line
@@ -140,10 +140,10 @@ xfs_init_security( 
	struct xfs_inode *ip = XFS_I(inode);

	size_t		length;

	void		*value;

	char		*name;

	unsigned char	*name;

	int		error;



	error = security_inode_init_security(inode, dir, &name,

	error = security_inode_init_security(inode, dir, (char **)&name,

					     &value, &length);

	if (error) {

		if (error == -EOPNOTSUPP)