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 <sfr@canb.auug.org.au>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 3f69eb213711b7fa79bf198780e9d7f9591c1e12..f3b44c394e6dab93338fe3de4463d87c6c5971c2 100644 (file)
--- 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;
        }