Commit-ID: baf524eccf91971632baf54dbe6a1ffc4854bcab
Gitweb: http://git.kernel.org/tip/baf524eccf91971632baf54dbe6a1ffc4854bcab
Author: Michel Lespinasse <walken@xxxxxxxxxx>
AuthorDate: Sat, 24 Nov 2012 18:44:23 -0800
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Tue, 11 Dec 2012 12:29:36 +0200
kvm tools: rb_int_search_single simplification
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 <walken@xxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/util/rbtree-interval.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/tools/kvm/util/rbtree-interval.c b/tools/kvm/util/rbtree-interval.c
index fd69252..740ff0d 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)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|