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

btrfs: refactor btrfs_set_prop and add btrfs_set_prop_trans 



btrfs_set_prop() takes transaction pointer as the first argument,
however in ioctl.c for the purpose of setting the compression property,
we call btrfs_set_prop() with NULL transaction pointer. Down in
the call chain  btrfs_setxattr() starts transaction to update the
attribute and also to update the inode.

So for clarity, create btrfs_set_prop_trans() with no transaction
pointer as argument, in preparation to start transaction here instead of
doing it down the call chain at btrfs_setxattr().

Also now the btrfs_set_prop() is a static function.

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 419a6f30

fs/btrfs/ioctl.c

+6 −6
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) 
		binode->flags &= ~BTRFS_INODE_COMPRESS;

		binode->flags |= BTRFS_INODE_NOCOMPRESS;



		ret = btrfs_set_prop(NULL, inode, "btrfs.compression", NULL, 0,

				     0);

		ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL,

					   0, 0);

		if (ret && ret != -ENODATA)

			goto out_drop;

	} else if (fsflags & FS_COMPR_FL) {
@@ -303,14 +303,14 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) 
		if (!comp || comp[0] == 0)

			comp = btrfs_compress_type2str(BTRFS_COMPRESS_ZLIB);



		ret = btrfs_set_prop(NULL, inode, "btrfs.compression", comp,

		ret = btrfs_set_prop_trans(inode, "btrfs.compression", comp,

					   strlen(comp), 0);

		if (ret)

			goto out_drop;



	} else {

		ret = btrfs_set_prop(NULL, inode, "btrfs.compression", NULL, 0,

				     0);

		ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL,

					   0, 0);

		if (ret && ret != -ENODATA)

			goto out_drop;

		binode->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS);

fs/btrfs/props.c

+9 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ find_prop_handler(const char *name, 
	return NULL;

}



int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,

static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,

			  const char *name, const char *value, size_t value_len,

			  int flags)

{
@@ -100,6 +100,12 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, 
	return 0;

}



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

			 const char *value, size_t value_len, int flags)

{

	return btrfs_set_prop(NULL, inode, name, value, value_len, flags);

}



static int iterate_object_props(struct btrfs_root *root,

				struct btrfs_path *path,

				u64 objectid,

fs/btrfs/props.h

+2 −3
Original line number Diff line number Diff line
@@ -10,9 +10,8 @@ 


void __init btrfs_props_init(void);



int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,

		   const char *name, const char *value, size_t value_len,

		   int flags);

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

			 const char *value, size_t value_len, int flags);



int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path);

fs/btrfs/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler, 
					size_t size, int flags)

{

	name = xattr_full_name(handler, name);

	return btrfs_set_prop(NULL, inode, name, value, size, flags);

	return btrfs_set_prop_trans(inode, name, value, size, flags);

}



static const struct xattr_handler btrfs_security_xattr_handler = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE