diff options
-rw-r--r-- | block/as-iosched.c | 5 | ||||
-rw-r--r-- | block/cfq-iosched.c | 8 | ||||
-rw-r--r-- | block/deadline-iosched.c | 5 |
3 files changed, 5 insertions, 13 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 |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 2540dfaa3e38..01c416ba8437 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -60,14 +60,9 @@ static DEFINE_RWLOCK(cfq_exit_lock); | |||
60 | /* | 60 | /* |
61 | * rb-tree defines | 61 | * rb-tree defines |
62 | */ | 62 | */ |
63 | #define RB_NONE (2) | ||
64 | #define RB_EMPTY(node) ((node)->rb_node == NULL) | 63 | #define RB_EMPTY(node) ((node)->rb_node == NULL) |
65 | #define RB_CLEAR_COLOR(node) (node)->rb_color = RB_NONE | ||
66 | #define RB_CLEAR(node) do { \ | 64 | #define RB_CLEAR(node) do { \ |
67 | (node)->rb_parent = NULL; \ | 65 | memset(node, 0, sizeof(*node)); \ |
68 | RB_CLEAR_COLOR((node)); \ | ||
69 | (node)->rb_right = NULL; \ | ||
70 | (node)->rb_left = NULL; \ | ||
71 | } while (0) | 66 | } while (0) |
72 | #define RB_CLEAR_ROOT(root) ((root)->rb_node = NULL) | 67 | #define RB_CLEAR_ROOT(root) ((root)->rb_node = NULL) |
73 | #define rb_entry_crq(node) rb_entry((node), struct cfq_rq, rb_node) | 68 | #define rb_entry_crq(node) rb_entry((node), struct cfq_rq, rb_node) |
@@ -563,7 +558,6 @@ static inline void cfq_del_crq_rb(struct cfq_rq *crq) | |||
563 | cfq_update_next_crq(crq); | 558 | cfq_update_next_crq(crq); |
564 | 559 | ||
565 | rb_erase(&crq->rb_node, &cfqq->sort_list); | 560 | rb_erase(&crq->rb_node, &cfqq->sort_list); |
566 | RB_CLEAR_COLOR(&crq->rb_node); | ||
567 | 561 | ||
568 | if (cfq_cfqq_on_rr(cfqq) && RB_EMPTY(&cfqq->sort_list)) | 562 | if (cfq_cfqq_on_rr(cfqq) && RB_EMPTY(&cfqq->sort_list)) |
569 | cfq_del_cfqq_rr(cfqd, cfqq); | 563 | cfq_del_cfqq_rr(cfqd, cfqq); |
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 399fa1e60e1f..06962d8402a3 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c | |||
@@ -165,10 +165,9 @@ deadline_find_drq_hash(struct deadline_data *dd, sector_t offset) | |||
165 | /* | 165 | /* |
166 | * rb tree support functions | 166 | * rb tree support functions |
167 | */ | 167 | */ |
168 | #define RB_NONE (2) | ||
169 | #define RB_EMPTY(root) ((root)->rb_node == NULL) | 168 | #define RB_EMPTY(root) ((root)->rb_node == NULL) |
170 | #define ON_RB(node) ((node)->rb_color != RB_NONE) | 169 | #define ON_RB(node) (rb_parent(node) != node) |
171 | #define RB_CLEAR(node) ((node)->rb_color = RB_NONE) | 170 | #define RB_CLEAR(node) (rb_set_parent(node, node)) |
172 | #define rb_entry_drq(node) rb_entry((node), struct deadline_rq, rb_node) | 171 | #define rb_entry_drq(node) rb_entry((node), struct deadline_rq, rb_node) |
173 | #define DRQ_RB_ROOT(dd, drq) (&(dd)->sort_list[rq_data_dir((drq)->request)]) | 172 | #define DRQ_RB_ROOT(dd, drq) (&(dd)->sort_list[rq_data_dir((drq)->request)]) |
174 | #define rq_rb_key(rq) (rq)->sector | 173 | #define rq_rb_key(rq) (rq)->sector |