Fix up CFQ scheduler for recent rbtree node shrinkage
The color is now in the low bits of the parent pointer, and initializing it to 0 happens as part of the whole memset above, so just remove the unnecessary RB_CLEAR_COLOR. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
58dfd9c16e
commit
6b41fd1785
|
@ -1318,7 +1318,6 @@ cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
|
||||||
|
|
||||||
if (cic) {
|
if (cic) {
|
||||||
memset(cic, 0, sizeof(*cic));
|
memset(cic, 0, sizeof(*cic));
|
||||||
RB_CLEAR_COLOR(&cic->rb_node);
|
|
||||||
cic->last_end_request = jiffies;
|
cic->last_end_request = jiffies;
|
||||||
INIT_LIST_HEAD(&cic->queue_list);
|
INIT_LIST_HEAD(&cic->queue_list);
|
||||||
cic->dtor = cfq_free_io_context;
|
cic->dtor = cfq_free_io_context;
|
||||||
|
|
Loading…
Reference in New Issue