diff options
Diffstat (limited to 'block/as-iosched.c')
| -rw-r--r-- | block/as-iosched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c index e25a5d79ab27..ed336ab453ba 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c | |||
| @@ -353,10 +353,9 @@ static struct request *as_find_arq_hash(struct as_data *ad, sector_t offset) | |||
| 353 | /* | 353 | /* |
| 354 | * rb tree support functions | 354 | * rb tree support functions |
| 355 | */ | 355 | */ |
| 356 | #define RB_NONE (2) | ||
| 357 | #define RB_EMPTY(root) ((root)->rb_node == NULL) | 356 | #define RB_EMPTY(root) ((root)->rb_node == NULL) |
| 358 | #define ON_RB(node) ((node)->rb_color != RB_NONE) | 357 | #define ON_RB(node) (rb_parent(node) != node) |
| 359 | #define RB_CLEAR(node) ((node)->rb_color = RB_NONE) | 358 | #define RB_CLEAR(node) (rb_set_parent(node, node)) |
| 360 | #define rb_entry_arq(node) rb_entry((node), struct as_rq, rb_node) | 359 | #define rb_entry_arq(node) rb_entry((node), struct as_rq, rb_node) |
| 361 | #define ARQ_RB_ROOT(ad, arq) (&(ad)->sort_list[(arq)->is_sync]) | 360 | #define ARQ_RB_ROOT(ad, arq) (&(ad)->sort_list[(arq)->is_sync]) |
| 362 | #define rq_rb_key(rq) (rq)->sector | 361 | #define rq_rb_key(rq) (rq)->sector |