As the rbtree intervals are not overlapping, rb_int_search_single can
trivially be implemented without making use of the max_high field.
Signed-off-by: Michel Lespinasse <wal...@google.com>
---
tools/kvm/util/rbtree-interval.c | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/tools/kvm/util/rbtree-interval.c b/tools/kvm/util/rbtree-interval.c
index fd69252bea02..740ff0d87536 100644
--- a/tools/kvm/util/rbtree-interval.c
+++ b/tools/kvm/util/rbtree-interval.c
@@ -5,27 +5,19 @@
struct rb_int_node *rb_int_search_single(struct rb_root *root, u64 point)
{
struct rb_node *node = root->rb_node;
- struct rb_node *lowest = NULL;
while (node) {
struct rb_int_node *cur = rb_int(node);
- if (node->rb_left && (rb_int(node->rb_left)->max_high > point))
{
+ if (point < cur->low)
node = node->rb_left;
- } else if (cur->low <= point && cur->high > point) {
- lowest = node;
- break;
- } else if (point > cur->low) {
+ else if (cur->high <= point)
node = node->rb_right;
- } else {
- break;
- }
+ else
+ return cur;
}
- if (lowest == NULL)
- return NULL;
-
- return rb_int(lowest);
+ return NULL;
}
struct rb_int_node *rb_int_search_range(struct rb_root *root, u64 low, u64
high)
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
