Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfadea40 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Greg Kroah-Hartman
Browse files

btrfs: make qgroup_free_reserved_data take btrfs_inode 



commit df2cfd131fd33dbef1ce33be8b332b1f3d645f35 upstream

It only uses btrfs_inode so can just as easily take it as an argument.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 812f39ed

fs/btrfs/qgroup.c

+6 −5
Original line number Diff line number Diff line
@@ -3481,10 +3481,10 @@ int btrfs_qgroup_reserve_data(struct inode *inode, 
}



/* Free ranges specified by @reserved, normally in error path */

static int qgroup_free_reserved_data(struct inode *inode,

static int qgroup_free_reserved_data(struct btrfs_inode *inode,

			struct extent_changeset *reserved, u64 start, u64 len)

{

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_root *root = inode->root;

	struct ulist_node *unode;

	struct ulist_iterator uiter;

	struct extent_changeset changeset;
@@ -3520,8 +3520,8 @@ static int qgroup_free_reserved_data(struct inode *inode, 
		 * EXTENT_QGROUP_RESERVED, we won't double free.

		 * So not need to rush.

		 */

		ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree,

				free_start, free_start + free_len - 1,

		ret = clear_record_extent_bits(&inode->io_tree, free_start,

				free_start + free_len - 1,

				EXTENT_QGROUP_RESERVED, &changeset);

		if (ret < 0)

			goto out;
@@ -3550,7 +3550,8 @@ static int __btrfs_qgroup_release_data(struct inode *inode, 
	/* In release case, we shouldn't have @reserved */

	WARN_ON(!free && reserved);

	if (free && reserved)

		return qgroup_free_reserved_data(inode, reserved, start, len);

		return qgroup_free_reserved_data(BTRFS_I(inode), reserved,

						 start, len);

	extent_changeset_init(&changeset);

	ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, start, 

			start + len -1, EXTENT_QGROUP_RESERVED, &changeset);