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

btrfs: prop: open code btrfs_set_prop in inherit_prop 



When an inode inherits property from its parent, we call btrfs_set_prop().
btrfs_set_prop() does an elaborate checks, which is not required in the
context of inheriting a property. Instead just open-code only the required
items from btrfs_set_prop() and then call btrfs_setxattr() directly. So
now the only user of btrfs_set_prop() is gone, (except for the wraper
function btrfs_set_prop_trans()).

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
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 ae0bc863

fs/btrfs/props.c

+24 −6
Original line number Original line Diff line number Diff line
@@ -344,22 +344,40 @@ static int inherit_props(struct btrfs_trans_handle *trans, 
		if (!value)

		if (!value)

			continue;

			continue;





		/*

		 * This is not strictly necessary as the property should be

		 * valid, but in case it isn't, don't propagate it futher.

		 */

		ret = h->validate(value, strlen(value));

		if (ret)

			continue;



		num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);

		num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);

		ret = btrfs_block_rsv_add(root, trans->block_rsv,

		ret = btrfs_block_rsv_add(root, trans->block_rsv,

					  num_bytes, BTRFS_RESERVE_NO_FLUSH);

					  num_bytes, BTRFS_RESERVE_NO_FLUSH);

		if (ret)

		if (ret)

			goto out;

			return ret;

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



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

				     strlen(value), 0);

				     strlen(value), 0);

		btrfs_block_rsv_release(fs_info, trans->block_rsv, num_bytes);

		if (!ret) {

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

			if (ret)

			if (ret)

			goto out;

				btrfs_setxattr(trans, inode, h->xattr_name,

					       NULL, 0, 0);

			else

				set_bit(BTRFS_INODE_HAS_PROPS,

					&BTRFS_I(inode)->runtime_flags);

		}

		}

	ret = 0;



out:

		btrfs_block_rsv_release(fs_info, trans->block_rsv, num_bytes);

		if (ret)

			return ret;

			return ret;

	}

	}





	return 0;

}



int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,

int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,

			      struct inode *inode,

			      struct inode *inode,

			      struct inode *dir)

			      struct inode *dir)

CRA Git | Maintained and supported by SUSTech CRA and CCSE