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

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

btrfs: make btrfs_qgroup_reserve_data take btrfs_inode 



commit 7661a3e033ab782366e0e1f4b6aad0df3555fcbd upstream

There's only a single use of vfs_inode in a tracepoint so let's take
btrfs_inode directly.

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 dfadea40

fs/btrfs/delalloc-space.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int btrfs_check_data_free_space(struct inode *inode, 
		return ret;



	/* Use new btrfs_qgroup_reserve_data to reserve precious data space. */

	ret = btrfs_qgroup_reserve_data(inode, reserved, start, len);

	ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), reserved, start, len);

	if (ret < 0)

		btrfs_free_reserved_data_space_noquota(inode, start, len);

	else

fs/btrfs/file.c

+4 −3
Original line number Diff line number Diff line
@@ -3149,7 +3149,7 @@ static int btrfs_zero_range(struct inode *inode, 
						  &cached_state);

		if (ret)

			goto out;

		ret = btrfs_qgroup_reserve_data(inode, &data_reserved,

		ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), &data_reserved,

						alloc_start, bytes_to_reserve);

		if (ret) {

			unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart,
@@ -3322,8 +3322,9 @@ static long btrfs_fallocate(struct file *file, int mode, 
				free_extent_map(em);

				break;

			}

			ret = btrfs_qgroup_reserve_data(inode, &data_reserved,

					cur_offset, last_byte - cur_offset);

			ret = btrfs_qgroup_reserve_data(BTRFS_I(inode),

					&data_reserved, cur_offset,

					last_byte - cur_offset);

			if (ret < 0) {

				cur_offset = last_byte;

				free_extent_map(em);

fs/btrfs/qgroup.c

+5 −5
Original line number Diff line number Diff line
@@ -3425,11 +3425,11 @@ btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info) 
 *       same @reserved, caller must ensure when error happens it's OK

 *       to free *ALL* reserved space.

 */

int btrfs_qgroup_reserve_data(struct inode *inode,

int btrfs_qgroup_reserve_data(struct btrfs_inode *inode,

			struct extent_changeset **reserved_ret, 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 *reserved;
@@ -3452,12 +3452,12 @@ int btrfs_qgroup_reserve_data(struct inode *inode, 
	reserved = *reserved_ret;

	/* Record already reserved space */

	orig_reserved = reserved->bytes_changed;

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

	ret = set_record_extent_bits(&inode->io_tree, start,

			start + len -1, EXTENT_QGROUP_RESERVED, reserved);



	/* Newly reserved space */

	to_reserve = reserved->bytes_changed - orig_reserved;

	trace_btrfs_qgroup_reserve_data(inode, start, len,

	trace_btrfs_qgroup_reserve_data(&inode->vfs_inode, start, len,

					to_reserve, QGROUP_RESERVE);

	if (ret < 0)

		goto cleanup;
@@ -3471,7 +3471,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, 
	/* cleanup *ALL* already reserved ranges */

	ULIST_ITER_INIT(&uiter);

	while ((unode = ulist_next(&reserved->range_changed, &uiter)))

		clear_extent_bit(&BTRFS_I(inode)->io_tree, unode->val,

		clear_extent_bit(&inode->io_tree, unode->val,

				 unode->aux, EXTENT_QGROUP_RESERVED, 0, 0, NULL);

	/* Also free data bytes of already reserved one */

	btrfs_qgroup_free_refroot(root->fs_info, root->root_key.objectid,

fs/btrfs/qgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid, 
#endif



/* New io_tree based accurate qgroup reserve API */

int btrfs_qgroup_reserve_data(struct inode *inode,

int btrfs_qgroup_reserve_data(struct btrfs_inode *inode,

			struct extent_changeset **reserved, u64 start, u64 len);

int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len);

int btrfs_qgroup_free_data(struct inode *inode,