btrfs: qgroup: Introduce helpers to update and access new qgroup rsv

[sfrench/cifs-2.6.git] / fs / btrfs / qgroup.c

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index aa259d6986e1c24049c8f500184b2393d99b0549..252af87340ccae6057719e60a7dd97f4ec06f647 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -47,6 +47,74 @@
  *  - check all ioctl parameters
  */
 
+/*
+ * Helpers to access qgroup reservation
+ *
+ * Callers should ensure the lock context and type are valid
+ */
+
+static u64 qgroup_rsv_total(const struct btrfs_qgroup *qgroup)
+{
+       u64 ret = 0;
+       int i;
+
+       for (i = 0; i < BTRFS_QGROUP_RSV_LAST; i++)
+               ret += qgroup->rsv.values[i];
+
+       return ret;
+}
+
+#ifdef CONFIG_BTRFS_DEBUG
+static const char *qgroup_rsv_type_str(enum btrfs_qgroup_rsv_type type)
+{
+       if (type == BTRFS_QGROUP_RSV_DATA)
+               return "data";
+       if (type == BTRFS_QGROUP_RSV_META)
+               return "meta";
+       return NULL;
+}
+#endif
+
+static void qgroup_rsv_add(struct btrfs_qgroup *qgroup, u64 num_bytes,
+                          enum btrfs_qgroup_rsv_type type)
+{
+       qgroup->rsv.values[type] += num_bytes;
+}
+
+static void qgroup_rsv_release(struct btrfs_qgroup *qgroup, u64 num_bytes,
+                              enum btrfs_qgroup_rsv_type type)
+{
+       if (qgroup->rsv.values[type] >= num_bytes) {
+               qgroup->rsv.values[type] -= num_bytes;
+               return;
+       }
+#ifdef CONFIG_BTRFS_DEBUG
+       WARN_RATELIMIT(1,
+               "qgroup %llu %s reserved space underflow, have %llu to free %llu",
+               qgroup->qgroupid, qgroup_rsv_type_str(type),
+               qgroup->rsv.values[type], num_bytes);
+#endif
+       qgroup->rsv.values[type] = 0;
+}
+
+static void qgroup_rsv_add_by_qgroup(struct btrfs_qgroup *dest,
+                                         struct btrfs_qgroup *src)
+{
+       int i;
+
+       for (i = 0; i < BTRFS_QGROUP_RSV_LAST; i++)
+               qgroup_rsv_add(dest, src->rsv.values[i], i);
+}
+
+static void qgroup_rsv_release_by_qgroup(struct btrfs_qgroup *dest,
+                                         struct btrfs_qgroup *src)
+{
+       int i;
+
+       for (i = 0; i < BTRFS_QGROUP_RSV_LAST; i++)
+               qgroup_rsv_release(dest, src->rsv.values[i], i);
+}
+
 static void btrfs_qgroup_update_old_refcnt(struct btrfs_qgroup *qg, u64 seq,
                                           int mod)
 {
@@ -826,10 +894,8 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans,
        int slot;
 
        mutex_lock(&fs_info->qgroup_ioctl_lock);
-       if (fs_info->quota_root) {
-               set_bit(BTRFS_FS_QUOTA_ENABLING, &fs_info->flags);
+       if (fs_info->quota_root)
                goto out;
-       }
 
        fs_info->qgroup_ulist = ulist_alloc(GFP_KERNEL);
        if (!fs_info->qgroup_ulist) {
@@ -923,8 +989,15 @@ out_add_root:
        }
        spin_lock(&fs_info->qgroup_lock);
        fs_info->quota_root = quota_root;
-       set_bit(BTRFS_FS_QUOTA_ENABLING, &fs_info->flags);
+       set_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
        spin_unlock(&fs_info->qgroup_lock);
+       ret = qgroup_rescan_init(fs_info, 0, 1);
+       if (!ret) {
+               qgroup_rescan_zero_tracking(fs_info);
+               btrfs_queue_work(fs_info->qgroup_rescan_workers,
+                                &fs_info->qgroup_rescan_work);
+       }
+
 out_free_path:
        btrfs_free_path(path);
 out_free_root:
@@ -2009,9 +2082,9 @@ out_free:
        return ret;
 }
 
-int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans,
-                                struct btrfs_fs_info *fs_info)
+int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct btrfs_qgroup_extent_record *record;
        struct btrfs_delayed_ref_root *delayed_refs;
        struct ulist *new_roots = NULL;
@@ -2080,17 +2153,9 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
 {
        struct btrfs_root *quota_root = fs_info->quota_root;
        int ret = 0;
-       int start_rescan_worker = 0;
 
        if (!quota_root)
-               goto out;
-
-       if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) &&
-           test_bit(BTRFS_FS_QUOTA_ENABLING, &fs_info->flags))
-               start_rescan_worker = 1;
-
-       if (test_and_clear_bit(BTRFS_FS_QUOTA_ENABLING, &fs_info->flags))
-               set_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
+               return ret;
 
        spin_lock(&fs_info->qgroup_lock);
        while (!list_empty(&fs_info->dirty_qgroups)) {
@@ -2119,18 +2184,6 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
        if (ret)
                fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;
 
-       if (!ret && start_rescan_worker) {
-               ret = qgroup_rescan_init(fs_info, 0, 1);
-               if (!ret) {
-                       qgroup_rescan_zero_tracking(fs_info);
-                       btrfs_queue_work(fs_info->qgroup_rescan_workers,
-                                        &fs_info->qgroup_rescan_work);
-               }
-               ret = 0;
-       }
-
-out:
-
        return ret;
 }
 
@@ -2449,7 +2502,8 @@ out:
 }
 
 void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
-                              u64 ref_root, u64 num_bytes)
+                              u64 ref_root, u64 num_bytes,
+                              enum btrfs_qgroup_rsv_type type)
 {
        struct btrfs_root *quota_root;
        struct btrfs_qgroup *qgroup;
@@ -2940,7 +2994,8 @@ static int qgroup_free_reserved_data(struct inode *inode,
                        goto out;
                freed += changeset.bytes_changed;
        }
-       btrfs_qgroup_free_refroot(root->fs_info, root->objectid, freed);
+       btrfs_qgroup_free_refroot(root->fs_info, root->objectid, freed,
+                                 BTRFS_QGROUP_RSV_DATA);
        ret = freed;
 out:
        extent_changeset_release(&changeset);
@@ -2972,7 +3027,7 @@ static int __btrfs_qgroup_release_data(struct inode *inode,
        if (free)
                btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
                                BTRFS_I(inode)->root->objectid,
-                               changeset.bytes_changed);
+                               changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);
        ret = changeset.bytes_changed;
 out:
        extent_changeset_release(&changeset);
@@ -3049,7 +3104,8 @@ void btrfs_qgroup_free_meta_all(struct btrfs_root *root)
        if (reserved == 0)
                return;
        trace_qgroup_meta_reserve(root, -(s64)reserved);
-       btrfs_qgroup_free_refroot(fs_info, root->objectid, reserved);
+       btrfs_qgroup_free_refroot(fs_info, root->objectid, reserved,
+                                 BTRFS_QGROUP_RSV_META);
 }
 
 void btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes)
@@ -3064,7 +3120,8 @@ void btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes)
        WARN_ON(atomic64_read(&root->qgroup_meta_rsv) < num_bytes);
        atomic64_sub(num_bytes, &root->qgroup_meta_rsv);
        trace_qgroup_meta_reserve(root, -(s64)num_bytes);
-       btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes);
+       btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes,
+                                 BTRFS_QGROUP_RSV_META);
 }
 
 /*
@@ -3092,7 +3149,7 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode)
                }
                btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
                                BTRFS_I(inode)->root->objectid,
-                               changeset.bytes_changed);
+                               changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);
 
        }
        extent_changeset_release(&changeset);