[PATCH 3/6] btrfs: qgroup: Make qgroup_reserve and its callers to use separate reservation type

[Qu Wenruo]

Since most caller of qgroup_reserve() is already defined by type,
converting qgroup_reserve() is quite an easy work.

Signed-off-by: Qu Wenruo <w...@suse.com>
---
 fs/btrfs/qgroup.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 04fd145516ad..7b89da9589c1 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -2399,17 +2399,18 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle 
*trans,
 static bool qgroup_check_limits(const struct btrfs_qgroup *qg, u64 num_bytes)
 {
        if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_RFER) &&
-           qg->reserved + (s64)qg->rfer + num_bytes > qg->max_rfer)
+           qgroup_rsv_total(qg) + (s64)qg->rfer + num_bytes > qg->max_rfer)
                return false;
 
        if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) &&
-           qg->reserved + (s64)qg->excl + num_bytes > qg->max_excl)
+           qgroup_rsv_total(qg) + (s64)qg->excl + num_bytes > qg->max_excl)
                return false;
 
        return true;
 }
 
-static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce)
+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;
@@ -2461,7 +2462,7 @@ static int qgroup_reserve(struct btrfs_root *root, u64 
num_bytes, bool enforce)
                         * Commit the tree and retry, since we may have
                         * deletions which would free up space.
                         */
-                       if (!retried && qg->reserved > 0) {
+                       if (!retried && qgroup_rsv_total(qg) > 0) {
                                struct btrfs_trans_handle *trans;
 
                                spin_unlock(&fs_info->qgroup_lock);
@@ -2501,7 +2502,7 @@ static int qgroup_reserve(struct btrfs_root *root, u64 
num_bytes, bool enforce)
                qg = unode_aux_to_qgroup(unode);
 
                trace_qgroup_update_reserve(fs_info, qg, num_bytes);
-               qg->reserved += num_bytes;
+               qgroup_rsv_increase(qg, num_bytes, type);
        }
 
 out:
@@ -2548,10 +2549,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info 
*fs_info,
                qg = unode_aux_to_qgroup(unode);
 
                trace_qgroup_update_reserve(fs_info, qg, -(s64)num_bytes);
-               if (qg->reserved < num_bytes)
-                       report_reserved_underflow(fs_info, qg, num_bytes);
-               else
-                       qg->reserved -= num_bytes;
+               qgroup_rsv_decrease(qg, num_bytes, type);
 
                list_for_each_entry(glist, &qg->groups, next_group) {
                        ret = ulist_add(fs_info->qgroup_ulist,
@@ -2939,7 +2937,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode,
                                        to_reserve, QGROUP_RESERVE);
        if (ret < 0)
                goto cleanup;
-       ret = qgroup_reserve(root, to_reserve, true);
+       ret = qgroup_reserve(root, to_reserve, true, BTRFS_QGROUP_RSV_DATA);
        if (ret < 0)
                goto cleanup;
 
@@ -3093,7 +3091,7 @@ int btrfs_qgroup_reserve_meta(struct btrfs_root *root, 
int num_bytes,
 
        BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize));
        trace_qgroup_meta_reserve(root, (s64)num_bytes);
-       ret = qgroup_reserve(root, num_bytes, enforce);
+       ret = qgroup_reserve(root, num_bytes, enforce, BTRFS_QGROUP_RSV_META);
        if (ret < 0)
                return ret;
        atomic64_add(num_bytes, &root->qgroup_meta_rsv);
-- 
2.14.2

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html