block, cfq: move cfqd->cic_index to q->id