The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH] rust: rbtree: remove redundant comparison in find_best_match
@ 2026-11-21 13:16 Joel Fernandes
  0 siblings, 0 replies; only message in thread
From: Joel Fernandes @ 2026-11-21 13:16 UTC (permalink / raw)
  To: linux-kernel, Miguel Ojeda, Boqun Feng, Gary Guo,
	Björn Roy Baron, Benno Lossin, Andreas Hindborg, Alice Ryhl,
	Trevor Gross, Danilo Krummrich, Daniel Almeida, Tamir Duberstein,
	Alexandre Courbot, Onur Özkan
  Cc: Joel Fernandes, rust-for-linux

In the Less arm of find_best_match(), the current node was recorded as
the best match only if its key was smaller than the key of the best
match found so far. That test can never fail, so remove it. It saves a
comparison and reduces lines of code.

Signed-off-by: Joel Fernandes <jfern@kernel.org>
---
 rust/kernel/rbtree.rs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/rust/kernel/rbtree.rs b/rust/kernel/rbtree.rs
index 6fbd579d4a43..5e64504d592e 100644
--- a/rust/kernel/rbtree.rs
+++ b/rust/kernel/rbtree.rs
@@ -493,7 +493,6 @@ pub fn cursor_lower_bound(&self, key: &K) -> Option<Cursor<'_, K, V>>
 
     fn find_best_match(&self, key: &K) -> Option<NonNull<bindings::rb_node>> {
         let mut node = self.root.rb_node;
-        let mut best_key: Option<&K> = None;
         let mut best_links: Option<NonNull<bindings::rb_node>> = None;
         while !node.is_null() {
             // SAFETY: By the type invariant of `Self`, all non-null `rb_node` pointers stored in `self`
@@ -515,15 +514,8 @@ fn find_best_match(&self, key: &K) -> Option<NonNull<bindings::rb_node>> {
                     node = node_ref.rb_right;
                 }
                 Ordering::Less => {
-                    let is_better_match = match best_key {
-                        None => true,
-                        Some(best) => best > this_key,
-                    };
-                    if is_better_match {
-                        best_key = Some(this_key);
-                        // SAFETY: `this` is a non-null node so it is valid by the type invariants.
-                        best_links = Some(unsafe { NonNull::new_unchecked(&mut (*this).links) });
-                    }
+                    // SAFETY: `this` is a non-null node so it is valid by the type invariants.
+                    best_links = Some(unsafe { NonNull::new_unchecked(&mut (*this).links) });
                     node = node_ref.rb_left;
                 }
             };
-- 
2.54.0


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-21 13:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-21 13:16 [PATCH] rust: rbtree: remove redundant comparison in find_best_match Joel Fernandes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox