@@ -838,7 +838,7 @@ add_delayed_ref_head(struct btrfs_trans_handle *trans,
static void init_delayed_ref_common(struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref,
u64 bytenr, u64 num_bytes, u64 ref_root,
- int action, u8 ref_type)
+ int action, u8 ref_type, u64 allocation_owning_root)
{
u64 seq = 0;
@@ -857,6 +857,7 @@ static void init_delayed_ref_common(struct btrfs_fs_info *fs_info,
ref->in_tree = 1;
ref->seq = seq;
ref->type = ref_type;
+ ref->allocation_owning_root = allocation_owning_root;
RB_CLEAR_NODE(&ref->ref_node);
INIT_LIST_HEAD(&ref->add_list);
}
@@ -915,7 +916,7 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
init_delayed_ref_common(fs_info, &ref->node, bytenr, num_bytes,
generic_ref->tree_ref.owning_root, action,
- ref_type);
+ ref_type, generic_ref->tree_ref.allocation_owning_root);
ref->root = generic_ref->tree_ref.owning_root;
ref->parent = parent;
ref->level = level;
@@ -989,7 +990,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
else
ref_type = BTRFS_EXTENT_DATA_REF_KEY;
init_delayed_ref_common(fs_info, &ref->node, bytenr, num_bytes,
- ref_root, action, ref_type);
+ ref_root, action, ref_type, ref_root);
ref->root = ref_root;
ref->parent = parent;
ref->objectid = owner;
@@ -32,6 +32,12 @@ struct btrfs_delayed_ref_node {
/* seq number to keep track of insertion order */
u64 seq;
+ /*
+ * root which originally allocated this extent and owns it for
+ * simple quota accounting purposes.
+ */
+ u64 allocation_owning_root;
+
/* ref count on this data structure */
refcount_t refs;
@@ -216,6 +222,12 @@ struct btrfs_tree_ref {
u64 owning_root;
/* For non-skinny metadata, no special member needed */
+
+ /*
+ * Root that originally allocated this block and owns the allocation for
+ * simple quota accounting purposes.
+ */
+ u64 allocation_owning_root;
};
struct btrfs_ref {
@@ -284,7 +296,8 @@ static inline void btrfs_init_generic_ref(struct btrfs_ref *generic_ref,
}
static inline void btrfs_init_tree_ref(struct btrfs_ref *generic_ref,
- int level, u64 root, u64 mod_root, bool skip_qgroup)
+ int level, u64 root, u64 mod_root,
+ bool skip_qgroup, u64 allocation_owning_root)
{
#ifdef CONFIG_BTRFS_FS_REF_VERIFY
/* If @real_root not set, use @root as fallback */
@@ -292,6 +305,7 @@ static inline void btrfs_init_tree_ref(struct btrfs_ref *generic_ref,
#endif
generic_ref->tree_ref.level = level;
generic_ref->tree_ref.owning_root = root;
+ generic_ref->tree_ref.allocation_owning_root = allocation_owning_root;
generic_ref->type = BTRFS_REF_METADATA;
if (skip_qgroup || !(is_fstree(root) &&
(!mod_root || is_fstree(mod_root))))
@@ -2446,7 +2446,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
btrfs_init_generic_ref(&generic_ref, action, bytenr,
num_bytes, parent);
btrfs_init_tree_ref(&generic_ref, level - 1, ref_root,
- root->root_key.objectid, for_reloc);
+ root->root_key.objectid, for_reloc, ref_root);
if (inc)
ret = btrfs_inc_extent_ref(trans, &generic_ref);
else
@@ -3268,7 +3268,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
btrfs_init_generic_ref(&generic_ref, BTRFS_DROP_DELAYED_REF,
buf->start, buf->len, parent);
btrfs_init_tree_ref(&generic_ref, btrfs_header_level(buf),
- root_id, 0, false);
+ root_id, 0, false, btrfs_header_owner(buf));
if (root_id != BTRFS_TREE_LOG_OBJECTID) {
btrfs_ref_tree_mod(fs_info, &generic_ref);
@@ -4952,7 +4952,7 @@ 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);
btrfs_init_tree_ref(&generic_ref, level, root_objectid,
- root->root_key.objectid, false);
+ root->root_key.objectid, false, btrfs_header_owner(buf));
btrfs_ref_tree_mod(fs_info, &generic_ref);
ret = btrfs_add_delayed_tree_ref(trans, &generic_ref, extent_op);
if (ret)
@@ -5374,7 +5374,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF, bytenr,
fs_info->nodesize, parent);
btrfs_init_tree_ref(&ref, level - 1, root->root_key.objectid,
- 0, false);
+ 0, false, btrfs_header_owner(next));
ret = btrfs_free_extent(trans, &ref);
if (ret)
goto out_unlock;
@@ -1384,7 +1384,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, old_bytenr,
blocksize, path->nodes[level]->start);
btrfs_init_tree_ref(&ref, level - 1, src->root_key.objectid,
- 0, true);
+ 0, true, src->root_key.objectid);
ret = btrfs_inc_extent_ref(trans, &ref);
if (ret) {
btrfs_abort_transaction(trans, ret);
@@ -1393,7 +1393,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, new_bytenr,
blocksize, 0);
btrfs_init_tree_ref(&ref, level - 1, dest->root_key.objectid, 0,
- true);
+ true, dest->root_key.objectid);
ret = btrfs_inc_extent_ref(trans, &ref);
if (ret) {
btrfs_abort_transaction(trans, ret);
@@ -1403,7 +1403,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF, new_bytenr,
blocksize, path->nodes[level]->start);
btrfs_init_tree_ref(&ref, level - 1, src->root_key.objectid,
- 0, true);
+ 0, true, src->root_key.objectid);
ret = btrfs_free_extent(trans, &ref);
if (ret) {
btrfs_abort_transaction(trans, ret);
@@ -1413,7 +1413,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF, old_bytenr,
blocksize, 0);
btrfs_init_tree_ref(&ref, level - 1, dest->root_key.objectid,
- 0, true);
+ 0, true, src->root_key.objectid);
ret = btrfs_free_extent(trans, &ref);
if (ret) {
btrfs_abort_transaction(trans, ret);
@@ -2494,7 +2494,8 @@ static int do_relocation(struct btrfs_trans_handle *trans,
upper->eb->start);
btrfs_init_tree_ref(&ref, node->level,
btrfs_header_owner(upper->eb),
- root->root_key.objectid, false);
+ root->root_key.objectid, false,
+ btrfs_header_owner(upper->eb));
ret = btrfs_inc_extent_ref(trans, &ref);
if (!ret)
ret = btrfs_drop_subtree(trans, root, eb,
While data extents require us to store additional inline refs to track the original owner on free, this information is available implicitly for metadata. It is found in the owner field of the header of the tree block. Even if other trees refer to this block and the original ref goes away, we will not rewrite that header field, so it will reliabl give the original owner. To use it for recording simple quota deltas, we need to wire this root id through from when we create the delayed ref until we fully process it and know that we are deleteing a metadata extent. Store it in the btrfs_tree_ref struct of the delayed tree ref. Signed-off-by: Boris Burkov <boris@bur.io> --- fs/btrfs/delayed-ref.c | 7 ++++--- fs/btrfs/delayed-ref.h | 16 +++++++++++++++- fs/btrfs/extent-tree.c | 8 ++++---- fs/btrfs/relocation.c | 11 ++++++----- 4 files changed, 29 insertions(+), 13 deletions(-)