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

Commit 8c1d1f3a authored by Marcos Paulo de Souza's avatar Marcos Paulo de Souza Committed by Greg Kroah-Hartman
Browse files

btrfs: qgroup: remove one-time use variables for quota_root checks 



commit e3b0edd29737d44137fc7583a9c185abda6e23b8 upstream.

Remove some variables that are set only to be checked later, and never
used.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarMarcos Paulo de Souza <mpdesouza@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarHarshvardhan Jha <harshvardhan.j.jha@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8b1499e

fs/btrfs/qgroup.c

+10 −24
Original line number Diff line number Diff line
@@ -1395,7 +1395,6 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, 
			      u64 dst)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *parent;

	struct btrfs_qgroup *member;

	struct btrfs_qgroup_list *list;
@@ -1411,8 +1410,7 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, 
		return -ENOMEM;



	mutex_lock(&fs_info->qgroup_ioctl_lock);

	quota_root = fs_info->quota_root;

	if (!quota_root) {

	if (!fs_info->quota_root) {

		ret = -EINVAL;

		goto out;

	}
@@ -1459,7 +1457,6 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, 
				 u64 dst)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *parent;

	struct btrfs_qgroup *member;

	struct btrfs_qgroup_list *list;
@@ -1472,8 +1469,7 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, 
	if (!tmp)

		return -ENOMEM;



	quota_root = fs_info->quota_root;

	if (!quota_root) {

	if (!fs_info->quota_root) {

		ret = -EINVAL;

		goto out;

	}
@@ -1539,11 +1535,11 @@ int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) 
	int ret = 0;



	mutex_lock(&fs_info->qgroup_ioctl_lock);

	quota_root = fs_info->quota_root;

	if (!quota_root) {

	if (!fs_info->quota_root) {

		ret = -EINVAL;

		goto out;

	}

	quota_root = fs_info->quota_root;

	qgroup = find_qgroup_rb(fs_info, qgroupid);

	if (qgroup) {

		ret = -EEXIST;
@@ -1568,14 +1564,12 @@ int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) 
int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *qgroup;

	struct btrfs_qgroup_list *list;

	int ret = 0;



	mutex_lock(&fs_info->qgroup_ioctl_lock);

	quota_root = fs_info->quota_root;

	if (!quota_root) {

	if (!fs_info->quota_root) {

		ret = -EINVAL;

		goto out;

	}
@@ -1617,7 +1611,6 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid, 
		       struct btrfs_qgroup_limit *limit)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *qgroup;

	int ret = 0;

	/* Sometimes we would want to clear the limit on this qgroup.
@@ -1627,8 +1620,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid, 
	const u64 CLEAR_VALUE = -1;



	mutex_lock(&fs_info->qgroup_ioctl_lock);

	quota_root = fs_info->quota_root;

	if (!quota_root) {

	if (!fs_info->quota_root) {

		ret = -EINVAL;

		goto out;

	}
@@ -2734,10 +2726,9 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) 
int btrfs_run_qgroups(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root = fs_info->quota_root;

	int ret = 0;



	if (!quota_root)

	if (!fs_info->quota_root)

		return ret;



	spin_lock(&fs_info->qgroup_lock);
@@ -3000,7 +2991,6 @@ static bool qgroup_check_limits(const struct btrfs_qgroup *qg, u64 num_bytes) 
static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce,

			  enum btrfs_qgroup_rsv_type type)

{

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *qgroup;

	struct btrfs_fs_info *fs_info = root->fs_info;

	u64 ref_root = root->root_key.objectid;
@@ -3019,8 +3009,7 @@ static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce, 
		enforce = false;



	spin_lock(&fs_info->qgroup_lock);

	quota_root = fs_info->quota_root;

	if (!quota_root)

	if (!fs_info->quota_root)

		goto out;



	qgroup = find_qgroup_rb(fs_info, ref_root);
@@ -3087,7 +3076,6 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info, 
			       u64 ref_root, u64 num_bytes,

			       enum btrfs_qgroup_rsv_type type)

{

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *qgroup;

	struct ulist_node *unode;

	struct ulist_iterator uiter;
@@ -3105,8 +3093,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info, 
	}

	spin_lock(&fs_info->qgroup_lock);



	quota_root = fs_info->quota_root;

	if (!quota_root)

	if (!fs_info->quota_root)

		goto out;



	qgroup = find_qgroup_rb(fs_info, ref_root);
@@ -3997,7 +3984,6 @@ void __btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes, 
static void qgroup_convert_meta(struct btrfs_fs_info *fs_info, u64 ref_root,

				int num_bytes)

{

	struct btrfs_root *quota_root = fs_info->quota_root;

	struct btrfs_qgroup *qgroup;

	struct ulist_node *unode;

	struct ulist_iterator uiter;
@@ -4005,7 +3991,7 @@ static void qgroup_convert_meta(struct btrfs_fs_info *fs_info, u64 ref_root, 


	if (num_bytes == 0)

		return;

	if (!quota_root)

	if (!fs_info->quota_root)

		return;



	spin_lock(&fs_info->qgroup_lock);