From: Jens Axboe Date: Fri, 16 Dec 2011 08:21:55 +0000 (+0100) Subject: cfq-iosched: fix merge error X-Git-Tag: next-20111220~49^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff56c895cf43c7896e5a5f31e2d55bb7fdbdb63e;p=karo-tx-linux.git cfq-iosched: fix merge error block/cfq-iosched.c: In function 'cfq_init_queue': block/cfq-iosched.c:3690:14: error: 'cic_index_lock' undeclared (first use in this function) block/cfq-iosched.c:3691:15: error: 'cic_index_ida' undeclared (first use in this function) block/cfq-iosched.c:3691:34: error: 'struct cfq_data' has no member named 'cic_index' Presumably this was not build tested with CONFIG_CFQ_GROUP_IOSCHED set. Reported-by: Stephen Rothwell Signed-off-by: Jens Axboe --- diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 3f69eb213711..f3b44c394e6d 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3686,11 +3686,6 @@ static void *cfq_init_queue(struct request_queue *q) if (blkio_alloc_blkg_stats(&cfqg->blkg)) { kfree(cfqg); - - spin_lock(&cic_index_lock); - ida_remove(&cic_index_ida, cfqd->cic_index); - spin_unlock(&cic_index_lock); - kfree(cfqd); return NULL; }