btrfs: pull up qgroup checks from delayed-ref core to init time

Instead of checking whether qgroup processing for a dealyed ref has to
happen in the core of delayed ref, simply pull the check at init time of
respective delayed ref structures. This eliminates the final use of
real_root in delayed-ref core paving the way to making this member
optional.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 15470582dca997732eb7f55bab689f4bb7c15f14..cca7e85e32dd6aae06a890c3c86f7a765ead33a4 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -921,8 +921,6 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
        }
 
        if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) &&
-           is_fstree(generic_ref->real_root) &&
-           is_fstree(generic_ref->tree_ref.owning_root) &&
            !generic_ref->skip_qgroup) {
                record = kzalloc(sizeof(*record), GFP_NOFS);
                if (!record) {
@@ -1027,8 +1025,6 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
        }
 
        if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) &&
-           is_fstree(ref_root) &&
-           is_fstree(generic_ref->real_root) &&
            !generic_ref->skip_qgroup) {
                record = kzalloc(sizeof(*record), GFP_NOFS);
                if (!record) {

diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index 8ab79def8e989c091d3ac1d4926564f947d9052e..7a0a2b21975df3a067df7e9c9fcf3dd5d3466374 100644 (file)
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -279,6 +279,12 @@ static inline void btrfs_init_tree_ref(struct btrfs_ref *generic_ref,
        generic_ref->tree_ref.level = level;
        generic_ref->tree_ref.owning_root = root;
        generic_ref->type = BTRFS_REF_METADATA;
+       if (skip_qgroup || !(is_fstree(root) &&
+                            (!mod_root || is_fstree(mod_root))))
+               generic_ref->skip_qgroup = true;
+       else
+               generic_ref->skip_qgroup = false;
+
 }
 
 static inline void btrfs_init_data_ref(struct btrfs_ref *generic_ref,
@@ -292,6 +298,11 @@ static inline void btrfs_init_data_ref(struct btrfs_ref *generic_ref,
        generic_ref->data_ref.ino = ino;
        generic_ref->data_ref.offset = offset;
        generic_ref->type = BTRFS_REF_DATA;
+       if (skip_qgroup || !(is_fstree(ref_root) &&
+                            (!mod_root || is_fstree(mod_root))))
+               generic_ref->skip_qgroup = true;
+       else
+               generic_ref->skip_qgroup = false;
 }
 
 static inline struct btrfs_delayed_extent_op *

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a4fbe4b1df80e3cc5ab2ed09e56d15addbc1562e..5a07386bd6d9eb8b0612d70385e34a305c482533 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2437,11 +2437,9 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
                        key.offset -= btrfs_file_extent_offset(buf, fi);
                        btrfs_init_generic_ref(&generic_ref, action, bytenr,
                                               num_bytes, parent);
-                       generic_ref.real_root = root->root_key.objectid;
                        btrfs_init_data_ref(&generic_ref, ref_root, key.objectid,
                                            key.offset, root->root_key.objectid,
                                            for_reloc);
-                       generic_ref.skip_qgroup = for_reloc;
                        if (inc)
                                ret = btrfs_inc_extent_ref(trans, &generic_ref);
                        else
@@ -2453,10 +2451,8 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
                        num_bytes = fs_info->nodesize;
                        btrfs_init_generic_ref(&generic_ref, action, bytenr,
                                               num_bytes, parent);
-                       generic_ref.real_root = root->root_key.objectid;
                        btrfs_init_tree_ref(&generic_ref, level - 1, ref_root,
                                            root->root_key.objectid, for_reloc);
-                       generic_ref.skip_qgroup = for_reloc;
                        if (inc)
                                ret = btrfs_inc_extent_ref(trans, &generic_ref);
                        else
@@ -4936,7 +4932,6 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
 
                btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_EXTENT,
                                       ins.objectid, ins.offset, parent);
-               generic_ref.real_root = root->root_key.objectid;
                btrfs_init_tree_ref(&generic_ref, level, root_objectid,
                                    root->root_key.objectid, false);
                btrfs_ref_tree_mod(fs_info, &generic_ref);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index fbff30bf1af933a67af7da573764eb76b50d78a5..dcc363fa4655ebd60f5944a8fcf8876ebb5cf027 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4919,7 +4919,6 @@ delete:
 
                        btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF,
                                        extent_start, extent_num_bytes, 0);
-                       ref.real_root = root->root_key.objectid;
                        btrfs_init_data_ref(&ref, btrfs_header_owner(leaf),
                                        ino, extent_offset,
                                        root->root_key.objectid, false);

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index ce3631760ef4db12b8de5a66a65875cc7502123d..fed8235962488f28f0deede850f381f3e48e3d02 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1146,7 +1146,6 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
                key.offset -= btrfs_file_extent_offset(leaf, fi);
                btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, new_bytenr,
                                       num_bytes, parent);
-               ref.real_root = root->root_key.objectid;
                btrfs_init_data_ref(&ref, btrfs_header_owner(leaf),
                                    key.objectid, key.offset,
                                    root->root_key.objectid, false);
@@ -1158,7 +1157,6 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
 
                btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF, bytenr,
                                       num_bytes, parent);
-               ref.real_root = root->root_key.objectid;
                btrfs_init_data_ref(&ref, btrfs_header_owner(leaf),
                                    key.objectid, key.offset,
                                    root->root_key.objectid, false);
@@ -1370,7 +1368,6 @@ again:
 
                btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, old_bytenr,
                                       blocksize, path->nodes[level]->start);
-               ref.skip_qgroup = true;
                btrfs_init_tree_ref(&ref, level - 1, src->root_key.objectid,
                                    0, true);
                ret = btrfs_inc_extent_ref(trans, &ref);
@@ -1380,7 +1377,6 @@ again:
                }
                btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, new_bytenr,
                                       blocksize, 0);
-               ref.skip_qgroup = true;
                btrfs_init_tree_ref(&ref, level - 1, dest->root_key.objectid, 0,
                                    true);
                ret = btrfs_inc_extent_ref(trans, &ref);
@@ -1393,7 +1389,6 @@ again:
                                       blocksize, path->nodes[level]->start);
                btrfs_init_tree_ref(&ref, level - 1, src->root_key.objectid,
                                    0, true);
-               ref.skip_qgroup = true;
                ret = btrfs_free_extent(trans, &ref);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
@@ -1404,7 +1399,6 @@ again:
                                       blocksize, 0);
                btrfs_init_tree_ref(&ref, level - 1, dest->root_key.objectid,
                                    0, true);
-               ref.skip_qgroup = true;
                ret = btrfs_free_extent(trans, &ref);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
@@ -2480,7 +2474,6 @@ static int do_relocation(struct btrfs_trans_handle *trans,
                        btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF,
                                               node->eb->start, blocksize,
                                               upper->eb->start);
-                       ref.real_root = root->root_key.objectid;
                        btrfs_init_tree_ref(&ref, node->level,
                                            btrfs_header_owner(upper->eb),
                                            root->root_key.objectid, false);