Commit 72b7d15b authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_qgroup_release_data take btrfs_inode 



It just forwards its argument to __btrfs_qgroup_release_data.

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>
parent a0ff10dc

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -9643,7 +9643,7 @@ static int insert_prealloc_file_extent(struct btrfs_trans_handle *trans, 
	btrfs_set_stack_file_extent_compression(&stack_fi, BTRFS_COMPRESS_NONE);

	/* Encryption and other encoding is reserved and all 0 */



	ret = btrfs_qgroup_release_data(inode, file_offset, len);

	ret = btrfs_qgroup_release_data(BTRFS_I(inode), file_offset, len);

	if (ret < 0)

		return ret;

	return insert_reserved_file_extent(trans, inode, file_offset,

fs/btrfs/ordered-data.c

+1 −2
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ static int __btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset 
		 * The ordered extent has reserved qgroup space, release now

		 * and pass the reserved number for qgroup_record to free.

		 */

		ret = btrfs_qgroup_release_data(&inode->vfs_inode, file_offset,

						num_bytes);

		ret = btrfs_qgroup_release_data(inode, file_offset, num_bytes);

		if (ret < 0)

			return ret;

	}

fs/btrfs/qgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -3613,9 +3613,9 @@ int btrfs_qgroup_free_data(struct btrfs_inode *inode, 
 *

 * NOTE: This function may sleep for memory allocation.

 */

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

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

{

	return __btrfs_qgroup_release_data(BTRFS_I(inode), NULL, start, len, 0);

	return __btrfs_qgroup_release_data(inode, NULL, start, len, 0);

}



static void add_root_meta_rsv(struct btrfs_root *root, int num_bytes,

fs/btrfs/qgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid, 
/* New io_tree based accurate qgroup reserve API */

int btrfs_qgroup_reserve_data(struct 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_release_data(struct btrfs_inode *inode, u64 start, u64 len);

int btrfs_qgroup_free_data(struct btrfs_inode *inode,

			   struct extent_changeset *reserved, u64 start,

			   u64 len);