From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 07/10] btrfs: relocation: Specify essential members for alloc_backref_node()
Date: Mon, 2 Mar 2020 17:45:50 +0800 [thread overview]
Message-ID: <20200302094553.58827-8-wqu@suse.com> (raw)
In-Reply-To: <20200302094553.58827-1-wqu@suse.com>
Bytenr and level are essential parameters for backref_node, thus it
makes sense to initial them at alloc time.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/relocation.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index c76849409c81..67a4a61eb86a 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -308,10 +308,12 @@ static void backref_cache_cleanup(struct backref_cache *cache)
ASSERT(!cache->nr_edges);
}
-static struct backref_node *alloc_backref_node(struct backref_cache *cache)
+static struct backref_node *alloc_backref_node(struct backref_cache *cache,
+ u64 bytenr, int level)
{
struct backref_node *node;
+ ASSERT(level >= 0 && level < BTRFS_MAX_LEVEL);
node = kzalloc(sizeof(*node), GFP_NOFS);
if (node) {
INIT_LIST_HEAD(&node->list);
@@ -319,6 +321,9 @@ static struct backref_node *alloc_backref_node(struct backref_cache *cache)
INIT_LIST_HEAD(&node->lower);
RB_CLEAR_NODE(&node->rb_node);
cache->nr_nodes++;
+
+ node->level = level;
+ node->bytenr = bytenr;
}
return node;
}
@@ -736,13 +741,12 @@ static int handle_one_tree_backref(struct reloc_control *rc,
rb_node = tree_search(&cache->rb_root, ref_key->offset);
if (!rb_node) {
/* Parent node not yet cached */
- upper = alloc_backref_node(cache);
+ upper = alloc_backref_node(cache, ref_key->offset,
+ cur->level + 1);
if (!upper) {
free_backref_edge(cache, edge);
return -ENOMEM;
}
- upper->bytenr = ref_key->offset;
- upper->level = cur->level + 1;
/*
* backrefs for the upper level block isn't
@@ -833,16 +837,15 @@ static int handle_one_tree_backref(struct reloc_control *rc,
eb = path->nodes[level];
rb_node = tree_search(&cache->rb_root, eb->start);
if (!rb_node) {
- upper = alloc_backref_node(cache);
+ upper = alloc_backref_node(cache, eb->start,
+ lower->level + 1);
if (!upper) {
btrfs_put_root(root);
free_backref_edge(cache, edge);
ret = -ENOMEM;
goto out;
}
- upper->bytenr = eb->start;
upper->owner = btrfs_header_owner(eb);
- upper->level = lower->level + 1;
if (!test_bit(BTRFS_ROOT_REF_COWS, &root->state))
upper->cowonly = 1;
@@ -934,14 +937,12 @@ struct backref_node *build_backref_tree(struct reloc_control *rc,
}
path->reada = READA_FORWARD;
- node = alloc_backref_node(cache);
+ node = alloc_backref_node(cache, bytenr, level);
if (!node) {
err = -ENOMEM;
goto out;
}
- node->bytenr = bytenr;
- node->level = level;
node->lowest = 1;
cur = node;
again:
@@ -1252,12 +1253,10 @@ static int clone_backref_node(struct btrfs_trans_handle *trans,
if (!node)
return 0;
- new_node = alloc_backref_node(cache);
+ new_node = alloc_backref_node(cache, dest->node->start, node->level);
if (!new_node)
return -ENOMEM;
- new_node->bytenr = dest->node->start;
- new_node->level = node->level;
new_node->lowest = node->lowest;
new_node->checked = 1;
new_node->root = btrfs_grab_root(dest);
--
2.25.1
next prev parent reply other threads:[~2020-03-02 9:46 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 9:45 [PATCH v2 00/10] btrfs: relocation: Refactor build_backref_tree() Qu Wenruo
2020-03-02 9:45 ` [PATCH v2 01/10] btrfs: backref: Introduce the skeleton of btrfs_backref_iter Qu Wenruo
2020-03-03 17:19 ` David Sterba
2020-03-04 0:50 ` Qu Wenruo
2020-03-03 17:25 ` David Sterba
2020-03-04 0:52 ` Qu Wenruo
2020-03-04 7:41 ` Nikolay Borisov
2020-03-02 9:45 ` [PATCH v2 02/10] btrfs: backref: Implement btrfs_backref_iter_next() Qu Wenruo
2020-03-02 9:45 ` [PATCH v2 03/10] btrfs: relocation: Use btrfs_backref_iter infrastructure Qu Wenruo
2020-03-02 9:45 ` [PATCH v2 04/10] btrfs: relocation: Rename mark_block_processed() and __mark_block_processed() Qu Wenruo
2020-03-02 17:21 ` Nikolay Borisov
2020-03-02 9:45 ` [PATCH v2 05/10] btrfs: relocation: Refactor tree backref processing into its own function Qu Wenruo
2020-03-03 17:29 ` David Sterba
2020-03-04 1:00 ` Qu Wenruo
2020-03-04 12:23 ` Nikolay Borisov
2020-03-04 12:33 ` Qu Wenruo
2020-03-02 9:45 ` [PATCH v2 06/10] btrfs: relocation: Use wrapper to replace open-coded edge linking Qu Wenruo
2020-03-03 17:30 ` David Sterba
2020-03-04 1:02 ` Qu Wenruo
2020-03-04 13:02 ` Nikolay Borisov
2020-03-02 9:45 ` Qu Wenruo [this message]
2020-03-04 13:06 ` [PATCH v2 07/10] btrfs: relocation: Specify essential members for alloc_backref_node() Nikolay Borisov
2020-03-04 13:09 ` Qu Wenruo
2020-03-02 9:45 ` [PATCH v2 08/10] btrfs: relocation: Remove the open-coded goto loop for breadth-first search Qu Wenruo
2020-03-04 14:24 ` Nikolay Borisov
2020-03-05 0:40 ` Qu Wenruo
2020-03-05 8:17 ` Nikolay Borisov
2020-03-05 8:37 ` Qu Wenruo
2020-03-02 9:45 ` [PATCH v2 09/10] btrfs: relocation: Refactor the finishing part of upper linkage into finish_upper_links() Qu Wenruo
2020-03-02 9:45 ` [PATCH v2 10/10] btrfs: relocation: Refactor the useless nodes handling into its own function Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200302094553.58827-8-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox