diff options
| author | Jens Axboe <axboe@suse.de> | 2006-07-11 21:15:52 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-09-30 20:26:56 +0200 |
| commit | 10fd48f2376db52f08bf0420d2c4f580e39269e1 (patch) | |
| tree | 89de18dcda9c8a09937187a0e8d138cfe3cb4089 /block | |
| parent | [PATCH] elevator: move the backmerging logic into the elevator core (diff) | |
| download | linux-10fd48f2376db52f08bf0420d2c4f580e39269e1.tar.xz linux-10fd48f2376db52f08bf0420d2c4f580e39269e1.zip | |
[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')
| -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) 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; |