blkcg: shoot down blkio_groups on elevator switch

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

diff --git a/block/elevator.c b/block/elevator.c
index 0bdea0ed03a3a37d82fe93fe67d4a92295887d83..8c7561fd2c7983f5934d84113401646c445a37e2 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -38,6 +38,7 @@
 #include <trace/events/block.h>
 
 #include "blk.h"
+#include "blk-cgroup.h"
 
 static DEFINE_SPINLOCK(elv_list_lock);
 static LIST_HEAD(elv_list);
@@ -894,6 +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);
+
        /* allocate, init and register new elevator */
        err = -ENOMEM;
        q->elevator = elevator_alloc(q, new_e);