blkcg: let blkcg core manage per-queue blkg list and counter

[karo-tx-linux.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 8c7561fd2c7983f5934d84113401646c445a37e2..d4d39dab841a2d5530aa48ecb26f7c49d7dd71d8 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -876,7 +876,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)
 {
        struct elevator_queue *old = q->elevator;
        bool registered = old->registered;
-       int err;
+       int i, err;
 
        /*
         * Turn on BYPASS and drain all requests w/ elevator private data.
@@ -895,7 +895,8 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)
        ioc_clear_queue(q);
        spin_unlock_irq(q->queue_lock);
 
-       blkg_destroy_all(q);
+       for (i = 0; i < BLKIO_NR_POLICIES; i++)
+               blkg_destroy_all(q, i, false);
 
        /* allocate, init and register new elevator */
        err = -ENOMEM;