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

Commit ddb47afa authored by Wang Shilong's avatar Wang Shilong Committed by Josef Bacik
Browse files

Btrfs: fix a warning when updating qgroup limit 



Step to reproduce:
	mkfs.btrfs <disk>
	mount <disk> <mnt>
	btrfs quota enable <mnt>
	btrfs qgroup limit 0/1 <mnt>
	dmesg

If the relative qgroup dosen't exist, flag 'BTRFS_QGROUP_STATUS_
FLAG_INCONSISTENT' will be set, and print the noise message.
This is wrong, we can just move find_qgroup_rb() before
update_qgroup_limit_item().this dosen't change the logic of the
function. But it can avoid unnecessary noise message and wrong set of flag.

Signed-off-by: default avatarWang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 3f5e2d3b

fs/btrfs/qgroup.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1092,6 +1092,11 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, 
		goto out;

		goto out;

	}

	}





	qgroup = find_qgroup_rb(fs_info, qgroupid);

	if (!qgroup) {

		ret = -ENOENT;

		goto out;

	}

	ret = update_qgroup_limit_item(trans, quota_root, qgroupid,

	ret = update_qgroup_limit_item(trans, quota_root, qgroupid,

				       limit->flags, limit->max_rfer,

				       limit->flags, limit->max_rfer,

				       limit->max_excl, limit->rsv_rfer,

				       limit->max_excl, limit->rsv_rfer,
@@ -1102,11 +1107,6 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, 
		       (unsigned long long)qgroupid);

		       (unsigned long long)qgroupid);

	}

	}





	qgroup = find_qgroup_rb(fs_info, qgroupid);

	if (!qgroup) {

		ret = -ENOENT;

		goto out;

	}

	spin_lock(&fs_info->qgroup_lock);

	spin_lock(&fs_info->qgroup_lock);

	qgroup->lim_flags = limit->flags;

	qgroup->lim_flags = limit->flags;

	qgroup->max_rfer = limit->max_rfer;

	qgroup->max_rfer = limit->max_rfer;