Commit cac237ae authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: rename btrfs_setxattr to btrfs_setxattr_trans 



Rename btrfs_setxattr() to btrfs_setxattr_trans(), so that do_setxattr()
can be renamed to btrfs_setxattr().
Preparatory patch, no functional changes.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 31aab402

fs/btrfs/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, 
			goto out;

	}



	ret = btrfs_setxattr(trans, inode, name, value, size, 0);

	ret = btrfs_setxattr_trans(trans, inode, name, value, size, 0);

out:

	kfree(value);

fs/btrfs/props.c

+10 −10
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, 
		return -EINVAL;



	if (value_len == 0) {

		ret = btrfs_setxattr(trans, inode, handler->xattr_name,

		ret = btrfs_setxattr_trans(trans, inode, handler->xattr_name,

					   NULL, 0, flags);

		if (ret)

			return ret;
@@ -84,13 +84,13 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, 
	ret = handler->validate(value, value_len);

	if (ret)

		return ret;

	ret = btrfs_setxattr(trans, inode, handler->xattr_name,

	ret = btrfs_setxattr_trans(trans, inode, handler->xattr_name,

				   value, value_len, flags);

	if (ret)

		return ret;

	ret = handler->apply(inode, value, value_len);

	if (ret) {

		btrfs_setxattr(trans, inode, handler->xattr_name,

		btrfs_setxattr_trans(trans, inode, handler->xattr_name,

				     NULL, 0, flags);

		return ret;

	}
@@ -358,12 +358,12 @@ static int inherit_props(struct btrfs_trans_handle *trans, 
		if (ret)

			return ret;



		ret = btrfs_setxattr(trans, inode, h->xattr_name, value,

		ret = btrfs_setxattr_trans(trans, inode, h->xattr_name, value,

					   strlen(value), 0);

		if (!ret) {

			ret = h->apply(inode, value, strlen(value));

			if (ret)

				btrfs_setxattr(trans, inode, h->xattr_name,

				btrfs_setxattr_trans(trans, inode, h->xattr_name,

						     NULL, 0, 0);

			else

				set_bit(BTRFS_INODE_HAS_PROPS,

fs/btrfs/xattr.c

+6 −6
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int do_setxattr(struct btrfs_trans_handle *trans, 
/*

 * @value: "" makes the attribute to empty, NULL removes it

 */

int btrfs_setxattr(struct btrfs_trans_handle *trans,

int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,

			 struct inode *inode, const char *name,

			 const void *value, size_t size, int flags)

{
@@ -370,7 +370,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler, 
				   size_t size, int flags)

{

	name = xattr_full_name(handler, name);

	return btrfs_setxattr(NULL, inode, name, buffer, size, flags);

	return btrfs_setxattr_trans(NULL, inode, name, buffer, size, flags);

}



static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
@@ -441,7 +441,7 @@ static int btrfs_initxattrs(struct inode *inode, 
		}

		strcpy(name, XATTR_SECURITY_PREFIX);

		strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name);

		err = btrfs_setxattr(trans, inode, name, xattr->value,

		err = btrfs_setxattr_trans(trans, inode, name, xattr->value,

					   xattr->value_len, 0);

		kfree(name);

		if (err < 0)

fs/btrfs/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ extern const struct xattr_handler *btrfs_xattr_handlers[]; 


int btrfs_getxattr(struct inode *inode, const char *name,

		void *buffer, size_t size);

int btrfs_setxattr(struct btrfs_trans_handle *trans,

int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,

			    struct inode *inode, const char *name,

			    const void *value, size_t size, int flags);

ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);