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

Commit 97d79299 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Al Viro
Browse files

posix acls: Remove duplicate xattr name definitions 



Remove POSIX_ACL_XATTR_{ACCESS,DEFAULT} and GFS2_POSIX_ACL_{ACCESS,DEFAULT}
and replace them with the definitions in <include/uapi/linux/xattr.h>.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarJames Morris <james.l.morris@oracle.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 44cb0d3f

drivers/staging/lustre/lustre/llite/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ 
static

int get_xattr_type(const char *name)

{

	if (!strcmp(name, POSIX_ACL_XATTR_ACCESS))

	if (!strcmp(name, XATTR_NAME_POSIX_ACL_ACCESS))

		return XATTR_ACL_ACCESS_T;



	if (!strcmp(name, POSIX_ACL_XATTR_DEFAULT))

	if (!strcmp(name, XATTR_NAME_POSIX_ACL_DEFAULT))

		return XATTR_ACL_DEFAULT_T;



	if (!strncmp(name, XATTR_USER_PREFIX,

fs/9p/acl.c

+6 −6
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ int v9fs_get_acl(struct inode *inode, struct p9_fid *fid) 
		return 0;

	}

	/* get the default/access acl values and cache them */

	dacl = __v9fs_get_acl(fid, POSIX_ACL_XATTR_DEFAULT);

	pacl = __v9fs_get_acl(fid, POSIX_ACL_XATTR_ACCESS);

	dacl = __v9fs_get_acl(fid, XATTR_NAME_POSIX_ACL_DEFAULT);

	pacl = __v9fs_get_acl(fid, XATTR_NAME_POSIX_ACL_ACCESS);



	if (!IS_ERR(dacl) && !IS_ERR(pacl)) {

		set_cached_acl(inode, ACL_TYPE_DEFAULT, dacl);
@@ -133,10 +133,10 @@ static int v9fs_set_acl(struct p9_fid *fid, int type, struct posix_acl *acl) 
		goto err_free_out;

	switch (type) {

	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

		name = XATTR_NAME_POSIX_ACL_ACCESS;

		break;

	case ACL_TYPE_DEFAULT:

		name = POSIX_ACL_XATTR_DEFAULT;

		name = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		BUG();
@@ -328,14 +328,14 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler, 
}



const struct xattr_handler v9fs_xattr_acl_access_handler = {

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.prefix	= XATTR_NAME_POSIX_ACL_ACCESS,

	.flags	= ACL_TYPE_ACCESS,

	.get	= v9fs_xattr_get_acl,

	.set	= v9fs_xattr_set_acl,

};



const struct xattr_handler v9fs_xattr_acl_default_handler = {

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.prefix	= XATTR_NAME_POSIX_ACL_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.get	= v9fs_xattr_get_acl,

	.set	= v9fs_xattr_set_acl,

fs/btrfs/acl.c

+4 −4
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 


	switch (type) {

	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

		name = XATTR_NAME_POSIX_ACL_ACCESS;

		break;

	case ACL_TYPE_DEFAULT:

		name = POSIX_ACL_XATTR_DEFAULT;

		name = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		BUG();
@@ -81,7 +81,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, 


	switch (type) {

	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

		name = XATTR_NAME_POSIX_ACL_ACCESS;

		if (acl) {

			ret = posix_acl_equiv_mode(acl, &inode->i_mode);

			if (ret < 0)
@@ -94,7 +94,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, 
	case ACL_TYPE_DEFAULT:

		if (!S_ISDIR(inode->i_mode))

			return acl ? -EINVAL : 0;

		name = POSIX_ACL_XATTR_DEFAULT;

		name = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		return -EINVAL;

fs/btrfs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -3550,10 +3550,10 @@ static noinline int acls_after_inode_item(struct extent_buffer *leaf, 
	int scanned = 0;



	if (!xattr_access) {

		xattr_access = btrfs_name_hash(POSIX_ACL_XATTR_ACCESS,

					strlen(POSIX_ACL_XATTR_ACCESS));

		xattr_default = btrfs_name_hash(POSIX_ACL_XATTR_DEFAULT,

					strlen(POSIX_ACL_XATTR_DEFAULT));

		xattr_access = btrfs_name_hash(XATTR_NAME_POSIX_ACL_ACCESS,

					strlen(XATTR_NAME_POSIX_ACL_ACCESS));

		xattr_default = btrfs_name_hash(XATTR_NAME_POSIX_ACL_DEFAULT,

					strlen(XATTR_NAME_POSIX_ACL_DEFAULT));

	}



	slot++;

fs/ceph/acl.c

+8 −8
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type) 


	switch (type) {

	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

		name = XATTR_NAME_POSIX_ACL_ACCESS;

		break;

	case ACL_TYPE_DEFAULT:

		name = POSIX_ACL_XATTR_DEFAULT;

		name = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		BUG();
@@ -92,7 +92,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) 


	switch (type) {

	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

		name = XATTR_NAME_POSIX_ACL_ACCESS;

		if (acl) {

			ret = posix_acl_equiv_mode(acl, &new_mode);

			if (ret < 0)
@@ -106,7 +106,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
			ret = acl ? -EINVAL : 0;

			goto out;

		}

		name = POSIX_ACL_XATTR_DEFAULT;

		name = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		ret = -EINVAL;
@@ -202,11 +202,11 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode, 
	ceph_pagelist_encode_32(pagelist, acl && default_acl ? 2 : 1);



	if (acl) {

		size_t len = strlen(POSIX_ACL_XATTR_ACCESS);

		size_t len = strlen(XATTR_NAME_POSIX_ACL_ACCESS);

		err = ceph_pagelist_reserve(pagelist, len + val_size1 + 8);

		if (err)

			goto out_err;

		ceph_pagelist_encode_string(pagelist, POSIX_ACL_XATTR_ACCESS,

		ceph_pagelist_encode_string(pagelist, XATTR_NAME_POSIX_ACL_ACCESS,

					    len);

		err = posix_acl_to_xattr(&init_user_ns, acl,

					 tmp_buf, val_size1);
@@ -216,12 +216,12 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode, 
		ceph_pagelist_append(pagelist, tmp_buf, val_size1);

	}

	if (default_acl) {

		size_t len = strlen(POSIX_ACL_XATTR_DEFAULT);

		size_t len = strlen(XATTR_NAME_POSIX_ACL_DEFAULT);

		err = ceph_pagelist_reserve(pagelist, len + val_size2 + 8);

		if (err)

			goto out_err;

		err = ceph_pagelist_encode_string(pagelist,

						  POSIX_ACL_XATTR_DEFAULT, len);

						  XATTR_NAME_POSIX_ACL_DEFAULT, len);

		err = posix_acl_to_xattr(&init_user_ns, default_acl,

					 tmp_buf, val_size2);

		if (err < 0)