Commit 10fd48f2 authored by Jens Axboe's avatar Jens Axboe Committed by Jens Axboe

[PATCH] rbtree: fixed reversed RB_EMPTY_NODE and rb_next/prev

The conditions got reserved. Also make rb_next() and rb_prev() check
for the empty condition.
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 9817064b
...@@ -336,7 +336,7 @@ static void as_add_arq_rb(struct as_data *ad, struct as_rq *arq) ...@@ -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) 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); WARN_ON(1);
return; return;
} }
...@@ -1039,7 +1039,7 @@ static void as_move_to_dispatch(struct as_data *ad, struct as_rq *arq) ...@@ -1039,7 +1039,7 @@ static void as_move_to_dispatch(struct as_data *ad, struct as_rq *arq)
struct request *rq = arq->request; struct request *rq = arq->request;
const int data_dir = arq->is_sync; 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); as_antic_stop(ad);
ad->antic_status = ANTIC_OFF; ad->antic_status = ANTIC_OFF;
......
...@@ -133,7 +133,7 @@ static inline void rb_set_color(struct rb_node *rb, int color) ...@@ -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_entry(ptr, type, member) container_of(ptr, type, member)
#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL) #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)) #define RB_CLEAR_NODE(node) (rb_set_parent(node, node))
extern void rb_insert_color(struct rb_node *, struct rb_root *); extern void rb_insert_color(struct rb_node *, struct rb_root *);
......
...@@ -322,6 +322,9 @@ struct rb_node *rb_next(struct rb_node *node) ...@@ -322,6 +322,9 @@ struct rb_node *rb_next(struct rb_node *node)
{ {
struct rb_node *parent; 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 /* If we have a right-hand child, go down and then left as far
as we can. */ as we can. */
if (node->rb_right) { if (node->rb_right) {
...@@ -348,6 +351,9 @@ struct rb_node *rb_prev(struct rb_node *node) ...@@ -348,6 +351,9 @@ struct rb_node *rb_prev(struct rb_node *node)
{ {
struct rb_node *parent; 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 /* If we have a left-hand child, go down and then right as far
as we can. */ as we can. */
if (node->rb_left) { if (node->rb_left) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment