Commit 6b41fd17 authored by Linus Torvalds's avatar Linus Torvalds

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: default avatarLinus Torvalds <torvalds@osdl.org>
parent 58dfd9c1
......@@ -1318,7 +1318,6 @@ cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
if (cic) {
memset(cic, 0, sizeof(*cic));
RB_CLEAR_COLOR(&cic->rb_node);
cic->last_end_request = jiffies;
INIT_LIST_HEAD(&cic->queue_list);
cic->dtor = cfq_free_io_context;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment