diff options
author | Jens Axboe <axboe@suse.de> | 2006-07-11 15:15:52 -0400 |
---|---|---|
committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-09-30 14:26:56 -0400 |
commit | 10fd48f2376db52f08bf0420d2c4f580e39269e1 (patch) | |
tree | 89de18dcda9c8a09937187a0e8d138cfe3cb4089 /block/as-iosched.c | |
parent | 9817064b68fef7e4580c6df1ea597e106b9ff88b (diff) |
[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: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'block/as-iosched.c')
-rw-r--r-- | block/as-iosched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c index 6db494333c3a..9d0f15a54c64 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c | |||
@@ -336,7 +336,7 @@ static void as_add_arq_rb(struct as_data *ad, struct as_rq *arq) | |||
336 | 336 | ||
337 | static inline void as_del_arq_rb(struct as_data *ad, struct as_rq *arq) | 337 | static inline void as_del_arq_rb(struct as_data *ad, struct as_rq *arq) |
338 | { | 338 | { |
339 | if (!RB_EMPTY_NODE(&arq->rb_node)) { | 339 | if (RB_EMPTY_NODE(&arq->rb_node)) { |
340 | WARN_ON(1); | 340 | WARN_ON(1); |
341 | return; | 341 | return; |
342 | } | 342 | } |
@@ -1039,7 +1039,7 @@ static void as_move_to_dispatch(struct as_data *ad, struct as_rq *arq) | |||
1039 | struct request *rq = arq->request; | 1039 | struct request *rq = arq->request; |
1040 | const int data_dir = arq->is_sync; | 1040 | const int data_dir = arq->is_sync; |
1041 | 1041 | ||
1042 | BUG_ON(!RB_EMPTY_NODE(&arq->rb_node)); | 1042 | BUG_ON(RB_EMPTY_NODE(&arq->rb_node)); |
1043 | 1043 | ||
1044 | as_antic_stop(ad); | 1044 | as_antic_stop(ad); |
1045 | ad->antic_status = ANTIC_OFF; | 1045 | ad->antic_status = ANTIC_OFF; |