diff options
Diffstat (limited to 'block/deadline-iosched.c')
| -rw-r--r-- | block/deadline-iosched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 3bd0415a9828..c94de8e12fbf 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 |