3 files changed, 13 insertions, 36 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 6c7927cd4f41..130df70f3348 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5337,7 +5337,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
         if (root->fs_info->quota_enabled) {
                 /* One for parent inode, two for dir entries */
                 num_bytes = 3 * root->nodesize;
-                ret = btrfs_qgroup_reserve(root, num_bytes);
+                ret = btrfs_qgroup_reserve_meta(root, num_bytes);
                 if (ret)
                         return ret;
         } else {
@@ -5355,10 +5355,8 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
         if (ret == -ENOSPC && use_global_rsv)
                 ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes);
 
-        if (ret) {
-                if (*qgroup_reserved)
-                        btrfs_qgroup_free(root, *qgroup_reserved);
-        }
+        if (ret && *qgroup_reserved)
+                btrfs_qgroup_free_meta(root, *qgroup_reserved);
 
         return ret;
 }
@@ -5519,15 +5517,15 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
         spin_unlock(&BTRFS_I(inode)->lock);
 
         if (root->fs_info->quota_enabled) {
-                ret = btrfs_qgroup_reserve(root, nr_extents * root->nodesize);
+                ret = btrfs_qgroup_reserve_meta(root,
+                                nr_extents * root->nodesize);
                 if (ret)
                         goto out_fail;
         }
 
         ret = reserve_metadata_bytes(root, block_rsv, to_reserve, flush);
         if (unlikely(ret)) {
-                if (root->fs_info->quota_enabled)
-                        btrfs_qgroup_free(root, nr_extents * root->nodesize);
+                btrfs_qgroup_free_meta(root, nr_extents * root->nodesize);
                 goto out_fail;
         }
 
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 9354e7a1247f..e377d7bb454e 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -480,13 +480,10 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
          * the appropriate flushing if need be.
          */
         if (num_items > 0 && root != root->fs_info->chunk_root) {
-                if (root->fs_info->quota_enabled &&
-                    is_fstree(root->root_key.objectid)) {
-                        qgroup_reserved = num_items * root->nodesize;
-                        ret = btrfs_qgroup_reserve(root, qgroup_reserved);
-                        if (ret)
-                                return ERR_PTR(ret);
-                }
+                qgroup_reserved = num_items * root->nodesize;
+                ret = btrfs_qgroup_reserve_meta(root, qgroup_reserved);
+                if (ret)
+                        return ERR_PTR(ret);
 
                 num_bytes = btrfs_calc_trans_metadata_size(root, num_items);
                 /*
@@ -547,6 +544,7 @@ again:
         h->transaction = cur_trans;
         h->root = root;
         h->use_count = 1;
+
         h->type = type;
         h->can_flush_pending_bgs = true;
         INIT_LIST_HEAD(&h->qgroup_ref_list);
@@ -568,7 +566,6 @@ again:
                 h->bytes_reserved = num_bytes;
                 h->reloc_reserved = reloc_reserved;
         }
-        h->qgroup_reserved = qgroup_reserved;
 
 got_it:
         btrfs_record_root_in_trans(h, root);
@@ -586,8 +583,7 @@ alloc_fail:
                 btrfs_block_rsv_release(root, &root->fs_info->trans_block_rsv,
                                         num_bytes);
 reserve_fail:
-        if (qgroup_reserved)
-                btrfs_qgroup_free(root, qgroup_reserved);
+        btrfs_qgroup_free_meta(root, qgroup_reserved);
         return ERR_PTR(ret);
 }
 
@@ -805,15 +801,6 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
                         must_run_delayed_refs = 2;
         }
 
-        if (trans->qgroup_reserved) {
-                /*
-                 * the same root has to be passed here between start_transaction
-                 * and end_transaction. Subvolume quota depends on this.
-                 */
-                btrfs_qgroup_free(trans->root, trans->qgroup_reserved);
-                trans->qgroup_reserved = 0;
-        }
-
         btrfs_trans_release_metadata(trans, root);
         trans->block_rsv = NULL;
 
@@ -1231,6 +1218,7 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans,
                         spin_lock(&fs_info->fs_roots_radix_lock);
                         if (err)
                                 break;
+                        btrfs_qgroup_free_meta_all(root);
                 }
         }
         spin_unlock(&fs_info->fs_roots_radix_lock);
@@ -1835,10 +1823,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
 
         btrfs_trans_release_metadata(trans, root);
         trans->block_rsv = NULL;
-        if (trans->qgroup_reserved) {
-                btrfs_qgroup_free(root, trans->qgroup_reserved);
-                trans->qgroup_reserved = 0;
-        }
 
         cur_trans = trans->transaction;
 
@@ -2191,10 +2175,6 @@ cleanup_transaction:
         btrfs_trans_release_metadata(trans, root);
         btrfs_trans_release_chunk_metadata(trans);
         trans->block_rsv = NULL;
-        if (trans->qgroup_reserved) {
-                btrfs_qgroup_free(root, trans->qgroup_reserved);
-                trans->qgroup_reserved = 0;
-        }
         btrfs_warn(root->fs_info, "Skipping commit of aborted transaction.");
         if (current->journal_info == trans)
                 current->journal_info = NULL;
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index db6bfd92f0ea..54b7dea74967 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -107,7 +107,6 @@ struct btrfs_trans_handle {
         u64 transid;
         u64 bytes_reserved;
         u64 chunk_bytes_reserved;
-        u64 qgroup_reserved;
         unsigned long use_count;
         unsigned long blocks_reserved;
         unsigned long blocks_used;