Commit ddf1d623 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs xattr updates from Al Viro:
 "Andreas' xattr cleanup series.

  It's a followup to his xattr work that went in last cycle; -0.5KLoC"

* 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  xattr handlers: Simplify list operation
  ocfs2: Replace list xattr handler operations
  nfs: Move call to security_inode_listsecurity into nfs_listxattr
  xfs: Change how listxattr generates synthetic attributes
  tmpfs: listxattr should include POSIX ACL xattrs
  tmpfs: Use xattr handler infrastructure
  btrfs: Use xattr handler infrastructure
  vfs: Distinguish between full xattr names and proper prefixes
  posix acls: Remove duplicate xattr name definitions
  gfs2: Remove gfs2_xattr_acl_chmod
  vfs: Remove vfs_xattr_cmp
parents 32fb3784 764a5c6b

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

+9 −15
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();
@@ -220,15 +220,12 @@ static int v9fs_xattr_get_acl(const struct xattr_handler *handler, 
	struct posix_acl *acl;

	int error;



	if (strcmp(name, "") != 0)

		return -EINVAL;



	v9ses = v9fs_dentry2v9ses(dentry);

	/*

	 * We allow set/get/list of acl when access=client is not specified

	 */

	if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT)

		return v9fs_xattr_get(dentry, handler->prefix, buffer, size);

		return v9fs_xattr_get(dentry, handler->name, buffer, size);



	acl = v9fs_get_cached_acl(d_inode(dentry), handler->flags);

	if (IS_ERR(acl))
@@ -250,16 +247,13 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler, 
	struct v9fs_session_info *v9ses;

	struct inode *inode = d_inode(dentry);



	if (strcmp(name, "") != 0)

		return -EINVAL;



	v9ses = v9fs_dentry2v9ses(dentry);

	/*

	 * set the attribute on the remote. Without even looking at the

	 * xattr value. We leave it to the server to validate

	 */

	if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT)

		return v9fs_xattr_set(dentry, handler->prefix, value, size,

		return v9fs_xattr_set(dentry, handler->name, value, size,

				      flags);



	if (S_ISLNK(inode->i_mode))
@@ -319,7 +313,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler, 
	default:

		BUG();

	}

	retval = v9fs_xattr_set(dentry, handler->prefix, value, size, flags);

	retval = v9fs_xattr_set(dentry, handler->name, value, size, flags);

	if (!retval)

		set_cached_acl(inode, handler->flags, acl);

err_out:
@@ -328,14 +322,14 @@ err_out: 
}



const struct xattr_handler v9fs_xattr_acl_access_handler = {

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.name	= 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,

	.name	= XATTR_NAME_POSIX_ACL_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.get	= v9fs_xattr_get_acl,

	.set	= v9fs_xattr_set_acl,

fs/9p/xattr.c

+0 −4
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ static int v9fs_xattr_handler_get(const struct xattr_handler *handler, 
{

	const char *full_name = xattr_full_name(handler, name);



	if (strcmp(name, "") == 0)

		return -EINVAL;

	return v9fs_xattr_get(dentry, full_name, buffer, size);

}
@@ -154,8 +152,6 @@ static int v9fs_xattr_handler_set(const struct xattr_handler *handler, 
{

	const char *full_name = xattr_full_name(handler, name);



	if (strcmp(name, "") == 0)

		return -EINVAL;

	return v9fs_xattr_set(dentry, full_name, value, size, flags);

}

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

+8 −8
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++;
@@ -9996,7 +9996,7 @@ static const struct inode_operations btrfs_dir_inode_operations = { 
	.setattr	= btrfs_setattr,

	.mknod		= btrfs_mknod,

	.setxattr	= btrfs_setxattr,

	.getxattr	= btrfs_getxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.permission	= btrfs_permission,
@@ -10073,7 +10073,7 @@ static const struct inode_operations btrfs_file_inode_operations = { 
	.getattr	= btrfs_getattr,

	.setattr	= btrfs_setattr,

	.setxattr	= btrfs_setxattr,

	.getxattr	= btrfs_getxattr,

	.getxattr	= generic_getxattr,

	.listxattr      = btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.permission	= btrfs_permission,
@@ -10087,7 +10087,7 @@ static const struct inode_operations btrfs_special_inode_operations = { 
	.setattr	= btrfs_setattr,

	.permission	= btrfs_permission,

	.setxattr	= btrfs_setxattr,

	.getxattr	= btrfs_getxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.get_acl	= btrfs_get_acl,
@@ -10101,7 +10101,7 @@ static const struct inode_operations btrfs_symlink_inode_operations = { 
	.setattr	= btrfs_setattr,

	.permission	= btrfs_permission,

	.setxattr	= btrfs_setxattr,

	.getxattr	= btrfs_getxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= btrfs_listxattr,

	.removexattr	= btrfs_removexattr,

	.update_time	= btrfs_update_time,

CRA Git | Maintained and supported by SUSTech CRA and CCSE