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

btrfs: rename do_setxattr to btrfs_setxattr 



When trans is not NULL btrfs_setxattr() calls do_setxattr() directly
with a check for readonly root. Rename do_setxattr() btrfs_setxattr() in
preparation to call do_setxattr() directly instead.  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 cac237ae

fs/btrfs/xattr.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ out: 
	return ret;

	return ret;

}

}





static int do_setxattr(struct btrfs_trans_handle *trans,

static int btrfs_setxattr(struct btrfs_trans_handle *trans,

			  struct inode *inode, const char *name,

			  struct inode *inode, const char *name,

			  const void *value, size_t size, int flags)

			  const void *value, size_t size, int flags)

{

{
@@ -231,13 +231,13 @@ int btrfs_setxattr_trans(struct btrfs_trans_handle *trans, 
		return -EROFS;

		return -EROFS;





	if (trans)

	if (trans)

		return do_setxattr(trans, inode, name, value, size, flags);

		return btrfs_setxattr(trans, inode, name, value, size, flags);





	trans = btrfs_start_transaction(root, 2);

	trans = btrfs_start_transaction(root, 2);

	if (IS_ERR(trans))

	if (IS_ERR(trans))

		return PTR_ERR(trans);

		return PTR_ERR(trans);





	ret = do_setxattr(trans, inode, name, value, size, flags);

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

	if (ret)

	if (ret)

		goto out;

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE