From: Yangtao Li <frank.li@vivo.com>
To: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Yangtao Li <frank.li@vivo.com>
Subject: [PATCH 05/13] btrfs: update lookup_block_entry to to use rb helper
Date: Tue, 22 Apr 2025 02:14:56 -0600 [thread overview]
Message-ID: <20250422081504.1998809-5-frank.li@vivo.com> (raw)
In-Reply-To: <20250422081504.1998809-1-frank.li@vivo.com>
Update lookup_block_entry() to use rb_find().
Suggested-by: David Sterba <dsterba@suse.com>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
fs/btrfs/ref-verify.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c
index 2928abf7eb82..6445c7d9a7b1 100644
--- a/fs/btrfs/ref-verify.c
+++ b/fs/btrfs/ref-verify.c
@@ -75,6 +75,20 @@ struct block_entry {
struct list_head actions;
};
+static int block_entry_key_cmp(const void *k, const struct rb_node *node)
+{
+ const u64 *bytenr = k;
+ const struct block_entry *entry =
+ rb_entry(node, struct block_entry, node);
+
+ if (entry->bytenr < *bytenr)
+ return 1;
+ else if (entry->bytenr > *bytenr)
+ return -1;
+
+ return 0;
+}
+
static struct block_entry *insert_block_entry(struct rb_root *root,
struct block_entry *be)
{
@@ -100,20 +114,10 @@ static struct block_entry *insert_block_entry(struct rb_root *root,
static struct block_entry *lookup_block_entry(struct rb_root *root, u64 bytenr)
{
- struct rb_node *n;
- struct block_entry *entry = NULL;
+ struct rb_node *node;
- n = root->rb_node;
- while (n) {
- entry = rb_entry(n, struct block_entry, node);
- if (entry->bytenr < bytenr)
- n = n->rb_right;
- else if (entry->bytenr > bytenr)
- n = n->rb_left;
- else
- return entry;
- }
- return NULL;
+ node = rb_find(&bytenr, root, block_entry_key_cmp);
+ return rb_entry_safe(node, struct block_entry, node);
}
static struct root_entry *insert_root_entry(struct rb_root *root,
--
2.39.0
next prev parent reply other threads:[~2025-04-22 7:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-22 8:14 [PATCH 01/13] btrfs: update btrfs_insert_inode_defrag to to use rb helper Yangtao Li
2025-04-22 8:14 ` [PATCH 02/13] btrfs: update __btrfs_lookup_delayed_item " Yangtao Li
2025-04-22 11:24 ` David Sterba
2025-04-22 8:14 ` [PATCH 03/13] btrfs: update ulist_rbtree_search " Yangtao Li
2025-04-22 8:14 ` [PATCH 04/13] btrfs: update ulist_rbtree_insert " Yangtao Li
2025-04-22 8:14 ` Yangtao Li [this message]
2025-04-22 8:14 ` [PATCH 06/13] btrfs: update insert_block_entry " Yangtao Li
2025-04-22 8:14 ` [PATCH 07/13] btrfs: update lookup_root_entry " Yangtao Li
2025-04-22 8:14 ` [PATCH 08/13] btrfs: update insert_root_entry " Yangtao Li
2025-04-22 8:15 ` [PATCH 09/13] btrfs: update insert_ref_entry " Yangtao Li
2025-04-22 8:15 ` [PATCH 10/13] btrfs: update find_qgroup_rb " Yangtao Li
2025-04-22 8:15 ` [PATCH 11/13] btrfs: update add_qgroup_rb " Yangtao Li
2025-04-22 8:15 ` [PATCH 12/13] btrfs: update btrfs_qgroup_trace_subtree_after_cow " Yangtao Li
2025-04-22 8:15 ` [PATCH 13/13] btrfs: update btrfs_qgroup_add_swapped_blocks " Yangtao Li
2025-04-22 11:21 ` [PATCH 01/13] btrfs: update btrfs_insert_inode_defrag " David Sterba
2025-05-20 5:14 ` Yangtao Li
2025-05-21 7:06 ` David Sterba
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=20250422081504.1998809-5-frank.li@vivo.com \
--to=frank.li@vivo.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@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