btrfs: qgroup: Split meta rsv type into meta_prealloc and meta_pertrans

Btrfs uses 2 different methods to reseve metadata qgroup space.

1) Reserve at btrfs_start_transaction() time
   This is quite straightforward, caller will use the trans handler
   allocated to modify b-trees.

   In this case, reserved metadata should be kept until qgroup numbers
   are updated.

2) Reserve by using block_rsv first, and later btrfs_join_transaction()
   This is more complicated, caller will reserve space using block_rsv
   first, and then later call btrfs_join_transaction() to get a trans
   handle.

   In this case, before we modify trees, the reserved space can be
   modified on demand, and after btrfs_join_transaction(), such reserved
   space should also be kept until qgroup numbers are updated.

Since these two types behave differently, split the original "META"
reservation type into 2 sub-types:

  META_PERTRANS:
    For above case 1)

  META_PREALLOC:
    For reservations that happened before btrfs_join_transaction() of
    case 2)

NOTE: This patch will only convert existing qgroup meta reservation
callers according to its situation, not ensuring all callers are at
correct timing.
Such fix will be added in later patches.

Signed-off-by: Qu Wenruo <wqu@suse.com>
[ update comments ]
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 15f6541303bc..5c4cf0f9146b 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -498,8 +498,8 @@ start_transaction(struct btrfs_root *root, unsigned int num_items,
          */
         if (num_items && root != fs_info->chunk_root) {
                 qgroup_reserved = num_items * fs_info->nodesize;
-                ret = btrfs_qgroup_reserve_meta(root, qgroup_reserved,
-                                                enforce_qgroups);
+                ret = btrfs_qgroup_reserve_meta_pertrans(root, qgroup_reserved,
+                                enforce_qgroups);
                 if (ret)
                         return ERR_PTR(ret);
 
@@ -596,7 +596,7 @@ alloc_fail:
                 btrfs_block_rsv_release(fs_info, &fs_info->trans_block_rsv,
                                         num_bytes);
 reserve_fail:
-        btrfs_qgroup_free_meta(root, qgroup_reserved);
+        btrfs_qgroup_free_meta_pertrans(root, qgroup_reserved);
         return ERR_PTR(ret);
 }
 
@@ -1284,7 +1284,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);
+                        btrfs_qgroup_free_meta_all_pertrans(root);
                 }
         }
         spin_unlock(&fs_info->fs_roots_radix_lock);