From dda4be53f124dbcc46d2aeaf991b1e80fc900d36 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Tue, 11 Jul 2006 21:15:52 +0200
Subject: [PATCH] --- yaml --- r: 37528 b: refs/heads/master c:
 10fd48f2376db52f08bf0420d2c4f580e39269e1 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/block/as-iosched.c     | 4 ++--
 trunk/include/linux/rbtree.h | 2 +-
 trunk/lib/rbtree.c           | 6 ++++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 41efd53a4e00..66bc8063c1b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9817064b68fef7e4580c6df1ea597e106b9ff88b
+refs/heads/master: 10fd48f2376db52f08bf0420d2c4f580e39269e1
diff --git a/trunk/block/as-iosched.c b/trunk/block/as-iosched.c
index 6db494333c3a..9d0f15a54c64 100644
--- a/trunk/block/as-iosched.c
+++ b/trunk/block/as-iosched.c
@@ -336,7 +336,7 @@ static void as_add_arq_rb(struct as_data *ad, struct as_rq *arq)
 
 static inline void as_del_arq_rb(struct as_data *ad, struct as_rq *arq)
 {
-	if (!RB_EMPTY_NODE(&arq->rb_node)) {
+	if (RB_EMPTY_NODE(&arq->rb_node)) {
 		WARN_ON(1);
 		return;
 	}
@@ -1039,7 +1039,7 @@ static void as_move_to_dispatch(struct as_data *ad, struct as_rq *arq)
 	struct request *rq = arq->request;
 	const int data_dir = arq->is_sync;
 
-	BUG_ON(!RB_EMPTY_NODE(&arq->rb_node));
+	BUG_ON(RB_EMPTY_NODE(&arq->rb_node));
 
 	as_antic_stop(ad);
 	ad->antic_status = ANTIC_OFF;
diff --git a/trunk/include/linux/rbtree.h b/trunk/include/linux/rbtree.h
index 8d5382e62c08..344bc3495ddb 100644
--- a/trunk/include/linux/rbtree.h
+++ b/trunk/include/linux/rbtree.h
@@ -133,7 +133,7 @@ static inline void rb_set_color(struct rb_node *rb, int color)
 #define	rb_entry(ptr, type, member) container_of(ptr, type, member)
 
 #define RB_EMPTY_ROOT(root)	((root)->rb_node == NULL)
-#define RB_EMPTY_NODE(node)	(rb_parent(node) != node)
+#define RB_EMPTY_NODE(node)	(rb_parent(node) == node)
 #define RB_CLEAR_NODE(node)	(rb_set_parent(node, node))
 
 extern void rb_insert_color(struct rb_node *, struct rb_root *);
diff --git a/trunk/lib/rbtree.c b/trunk/lib/rbtree.c
index 1e55ba1c2edf..48499c2d88cc 100644
--- a/trunk/lib/rbtree.c
+++ b/trunk/lib/rbtree.c
@@ -322,6 +322,9 @@ struct rb_node *rb_next(struct rb_node *node)
 {
 	struct rb_node *parent;
 
+	if (rb_parent(node) == node)
+		return NULL;
+
 	/* If we have a right-hand child, go down and then left as far
 	   as we can. */
 	if (node->rb_right) {
@@ -348,6 +351,9 @@ struct rb_node *rb_prev(struct rb_node *node)
 {
 	struct rb_node *parent;
 
+	if (rb_parent(node) == node)
+		return NULL;
+
 	/* If we have a left-hand child, go down and then right as far
 	   as we can. */
 	if (node->rb_left) {