diff --git a/[refs] b/[refs] index 568e69823fed..0054d6a533dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58dfd9c16e88b9d790e7df8f2c5b03b7887db54c +refs/heads/master: 6b41fd1785f4effe2f3bd40da864415812f5b8c9 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 6200d9b9af28..e2e6ad0a158e 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -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;