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

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

btrfs: export and rename qgroup_reserve_meta 



commit 80e9baed722c853056e0c5374f51524593cb1031 upstream

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 41a9b8f3

fs/btrfs/qgroup.c

+4 −4
Original line number Diff line number Diff line
@@ -3800,7 +3800,7 @@ static int sub_root_meta_rsv(struct btrfs_root *root, int num_bytes, 
	return num_bytes;

}



static int qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,

int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,

			      enum btrfs_qgroup_rsv_type type, bool enforce)

{

	struct btrfs_fs_info *fs_info = root->fs_info;
@@ -3832,14 +3832,14 @@ int __btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, 
{

	int ret;



	ret = qgroup_reserve_meta(root, num_bytes, type, enforce);

	ret = btrfs_qgroup_reserve_meta(root, num_bytes, type, enforce);

	if (ret <= 0 && ret != -EDQUOT)

		return ret;



	ret = try_flush_qgroup(root);

	if (ret < 0)

		return ret;

	return qgroup_reserve_meta(root, num_bytes, type, enforce);

	return btrfs_qgroup_reserve_meta(root, num_bytes, type, enforce);

}



void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root)

fs/btrfs/qgroup.h

+2 −1
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ int btrfs_qgroup_reserve_data(struct btrfs_inode *inode, 
int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len);

int btrfs_qgroup_free_data(struct inode *inode,

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



int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,

			      enum btrfs_qgroup_rsv_type type, bool enforce);

int __btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,

				enum btrfs_qgroup_rsv_type type, bool enforce);

/* Reserve metadata space for pertrans and prealloc type */