Merge branch 'master' into upstream

[karo-tx-linux.git] / block / cfq-iosched.c

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 6200d9b9af28efbbd5aaac5373995ca8334dbaaf..e2e6ad0a158e2201d81af14f90008a7b538d5ed7 100644 (file)
--- a/block/cfq-iosched.c
+++ b/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;