btrfs: rename tree_ref and data_ref owning_root

commit 113479d5b8eb ("btrfs: rename root fields in delayed refs structs")
changed these from ref_root to owning_root. However, there are many
circumstances where that name is not really accurate and the root on the
ref struct _is_ the referring root. In general, these are not the owning
root, though it does happen in some ref merging cases involving
overwrites during snapshots and similar.

Simple quotas cares quite a bit about tracking the original owner of an
extent through delayed refs, so rename these back to free up the name
for the real owning root (which will live on the generic btrfs_ref and
the head ref)

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 0a80224c87840e4c7ac4be6c045688bb96f7f239..9d6a5dafd9b8f5aa8091ae1a02beab54a95af0af 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -946,7 +946,7 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
        u64 parent = generic_ref->parent;
        u8 ref_type;
 
-       is_system = (generic_ref->tree_ref.owning_root == BTRFS_CHUNK_TREE_OBJECTID);
+       is_system = (generic_ref->tree_ref.ref_root == BTRFS_CHUNK_TREE_OBJECTID);
 
        ASSERT(generic_ref->type == BTRFS_REF_METADATA && generic_ref->action);
        ref = kmem_cache_alloc(btrfs_delayed_tree_ref_cachep, GFP_NOFS);
@@ -974,14 +974,14 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
                ref_type = BTRFS_TREE_BLOCK_REF_KEY;
 
        init_delayed_ref_common(fs_info, &ref->node, bytenr, num_bytes,
-                               generic_ref->tree_ref.owning_root, action,
+                               generic_ref->tree_ref.ref_root, action,
                                ref_type);
-       ref->root = generic_ref->tree_ref.owning_root;
+       ref->root = generic_ref->tree_ref.ref_root;
        ref->parent = parent;
        ref->level = level;
 
        init_delayed_ref_head(head_ref, record, bytenr, num_bytes,
-                             generic_ref->tree_ref.owning_root, 0, action,
+                             generic_ref->tree_ref.ref_root, 0, action,
                              false, is_system);
        head_ref->extent_op = extent_op;
 
@@ -1034,7 +1034,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
        u64 bytenr = generic_ref->bytenr;
        u64 num_bytes = generic_ref->len;
        u64 parent = generic_ref->parent;
-       u64 ref_root = generic_ref->data_ref.owning_root;
+       u64 ref_root = generic_ref->data_ref.ref_root;
        u64 owner = generic_ref->data_ref.ino;
        u64 offset = generic_ref->data_ref.offset;
        u8 ref_type;

diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index 783f84c9f2f4f4ee13b0e28b824effe6b50d51a1..a7fdb28df1cda4150eafc50d4293abf906771df1 100644 (file)
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -194,8 +194,8 @@ enum btrfs_ref_type {
 struct btrfs_data_ref {
        /* For EXTENT_DATA_REF */
 
-       /* Original root this data extent belongs to */
-       u64 owning_root;
+       /* Root which owns this data reference. */
+       u64 ref_root;
 
        /* Inode which refers to this data extent */
        u64 ino;
@@ -218,11 +218,11 @@ struct btrfs_tree_ref {
        int level;
 
        /*
-        * Root which owns this tree block.
+        * Root which owns this tree block reference.
         *
         * For TREE_BLOCK_REF (skinny metadata, either inline or keyed)
         */
-       u64 owning_root;
+       u64 ref_root;
 
        /* For non-skinny metadata, no special member needed */
 };
@@ -311,7 +311,7 @@ static inline void btrfs_init_tree_ref(struct btrfs_ref *generic_ref,
        generic_ref->real_root = mod_root ?: root;
 #endif
        generic_ref->tree_ref.level = level;
-       generic_ref->tree_ref.owning_root = root;
+       generic_ref->tree_ref.ref_root = root;
        generic_ref->type = BTRFS_REF_METADATA;
        if (skip_qgroup || !(is_fstree(root) &&
                             (!mod_root || is_fstree(mod_root))))
@@ -329,7 +329,7 @@ static inline void btrfs_init_data_ref(struct btrfs_ref *generic_ref,
        /* If @real_root not set, use @root as fallback */
        generic_ref->real_root = mod_root ?: ref_root;
 #endif
-       generic_ref->data_ref.owning_root = ref_root;
+       generic_ref->data_ref.ref_root = ref_root;
        generic_ref->data_ref.ino = ino;
        generic_ref->data_ref.offset = offset;
        generic_ref->type = BTRFS_REF_DATA;

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 09e2b5522922c1b23fa934b0a2445d39dd0e6940..52efc8e44cdb9dd829815840c3c22f9225211777 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1424,7 +1424,7 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
        ASSERT(generic_ref->type != BTRFS_REF_NOT_SET &&
               generic_ref->action);
        BUG_ON(generic_ref->type == BTRFS_REF_METADATA &&
-              generic_ref->tree_ref.owning_root == BTRFS_TREE_LOG_OBJECTID);
+              generic_ref->tree_ref.ref_root == BTRFS_TREE_LOG_OBJECTID);
 
        if (generic_ref->type == BTRFS_REF_METADATA)
                ret = btrfs_add_delayed_tree_ref(trans, generic_ref, NULL);
@@ -3376,9 +3376,9 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref)
         * tree, just update pinning info and exit early.
         */
        if ((ref->type == BTRFS_REF_METADATA &&
-            ref->tree_ref.owning_root == BTRFS_TREE_LOG_OBJECTID) ||
+            ref->tree_ref.ref_root == BTRFS_TREE_LOG_OBJECTID) ||
            (ref->type == BTRFS_REF_DATA &&
-            ref->data_ref.owning_root == BTRFS_TREE_LOG_OBJECTID)) {
+            ref->data_ref.ref_root == BTRFS_TREE_LOG_OBJECTID)) {
                btrfs_pin_extent(trans, ref->bytenr, ref->len, 1);
                ret = 0;
        } else if (ref->type == BTRFS_REF_METADATA) {
@@ -3388,9 +3388,9 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref)
        }
 
        if (!((ref->type == BTRFS_REF_METADATA &&
-              ref->tree_ref.owning_root == BTRFS_TREE_LOG_OBJECTID) ||
+              ref->tree_ref.ref_root == BTRFS_TREE_LOG_OBJECTID) ||
              (ref->type == BTRFS_REF_DATA &&
-              ref->data_ref.owning_root == BTRFS_TREE_LOG_OBJECTID)))
+              ref->data_ref.ref_root == BTRFS_TREE_LOG_OBJECTID)))
                btrfs_ref_tree_mod(fs_info, ref);
 
        return ret;

diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c
index 26a7fb655f7148607d723b25f3feb2651fc604c2..e9e1ebd8dd6afb3991708300e1c60d225ee67497 100644 (file)
--- a/fs/btrfs/ref-verify.c
+++ b/fs/btrfs/ref-verify.c
@@ -681,10 +681,10 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,
 
        if (generic_ref->type == BTRFS_REF_METADATA) {
                if (!parent)
-                       ref_root = generic_ref->tree_ref.owning_root;
+                       ref_root = generic_ref->tree_ref.ref_root;
                owner = generic_ref->tree_ref.level;
        } else if (!parent) {
-               ref_root = generic_ref->data_ref.owning_root;
+               ref_root = generic_ref->data_ref.ref_root;
                owner = generic_ref->data_ref.ino;
                offset = generic_ref->data_ref.offset;
        }