btrfs: start transaction in xattr_handler_set_prop (b3f6a4be) · Commits · 戴 / test

btrfs specific extended attributes on the inode are set using btrfs_xattr_handler_set_prop(), and the required transaction for this update is started by btrfs_setxattr(). For better visibility of the transaction start and end, do this in btrfs_xattr_handler_set_prop(). For which this patch copied code of btrfs_setxattr() as it is in the original, which needs proper error handling. Signed-off-by:

Anand Jain <anand.jain@oracle.com> Reviewed-by:

David Sterba <dsterba@suse.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/xattr.c

+20 −1

Original line number	Diff line number	Diff line
		@@ -372,12 +372,31 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
		size_t size, int flags)
		{
		int ret;
		struct btrfs_trans_handle *trans;
		struct btrfs_root *root = BTRFS_I(inode)->root;

		name = xattr_full_name(handler, name);
		ret = btrfs_validate_prop(name, value, size);
		if (ret)
		return ret;
		return btrfs_set_prop_trans(inode, name, value, size, flags);

		trans = btrfs_start_transaction(root, 2);
		if (IS_ERR(trans))
		return PTR_ERR(trans);

		ret = btrfs_set_prop(trans, inode, name, value, size, flags);
		if (!ret) {
		inode_inc_iversion(inode);
		inode->i_ctime = current_time(inode);
		set_bit(BTRFS_INODE_COPY_EVERYTHING,
		&BTRFS_I(inode)->runtime_flags);
		ret = btrfs_update_inode(trans, root, inode);
		BUG_ON(ret);
		}

		btrfs_end_transaction(trans);

		return ret;
		}

		static const struct xattr_handler btrfs_security_xattr_handler = {

Admin message