blk-wbt: remove wbt_update_limits

[linux-2.6-block.git] / block / blk-throttle.c

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 98233c9c65a8d18adc7b76d88f466cf6c1e34a67..209fdd8939fba636996dce2a4536df5c0c649450 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -2358,69 +2358,6 @@ void blk_throtl_bio_endio(struct bio *bio)
 }
 #endif
 
-/*
- * Dispatch all bios from all children tg's queued on @parent_sq.  On
- * return, @parent_sq is guaranteed to not have any active children tg's
- * and all bios from previously active tg's are on @parent_sq->bio_lists[].
- */
-static void tg_drain_bios(struct throtl_service_queue *parent_sq)
-{
-       struct throtl_grp *tg;
-
-       while ((tg = throtl_rb_first(parent_sq))) {
-               struct throtl_service_queue *sq = &tg->service_queue;
-               struct bio *bio;
-
-               throtl_dequeue_tg(tg);
-
-               while ((bio = throtl_peek_queued(&sq->queued[READ])))
-                       tg_dispatch_one_bio(tg, bio_data_dir(bio));
-               while ((bio = throtl_peek_queued(&sq->queued[WRITE])))
-                       tg_dispatch_one_bio(tg, bio_data_dir(bio));
-       }
-}
-
-/**
- * blk_throtl_drain - drain throttled bios
- * @q: request_queue to drain throttled bios for
- *
- * Dispatch all currently throttled bios on @q through ->make_request_fn().
- */
-void blk_throtl_drain(struct request_queue *q)
-       __releases(&q->queue_lock) __acquires(&q->queue_lock)
-{
-       struct throtl_data *td = q->td;
-       struct blkcg_gq *blkg;
-       struct cgroup_subsys_state *pos_css;
-       struct bio *bio;
-       int rw;
-
-       rcu_read_lock();
-
-       /*
-        * Drain each tg while doing post-order walk on the blkg tree, so
-        * that all bios are propagated to td->service_queue.  It'd be
-        * better to walk service_queue tree directly but blkg walk is
-        * easier.
-        */
-       blkg_for_each_descendant_post(blkg, pos_css, td->queue->root_blkg)
-               tg_drain_bios(&blkg_to_tg(blkg)->service_queue);
-
-       /* finally, transfer bios from top-level tg's into the td */
-       tg_drain_bios(&td->service_queue);
-
-       rcu_read_unlock();
-       spin_unlock_irq(&q->queue_lock);
-
-       /* all bios now should be in td->service_queue, issue them */
-       for (rw = READ; rw <= WRITE; rw++)
-               while ((bio = throtl_pop_queued(&td->service_queue.queued[rw],
-                                               NULL)))
-                       generic_make_request(bio);
-
-       spin_lock_irq(&q->queue_lock);
-}
-
 int blk_throtl_init(struct request_queue *q)
 {
        struct throtl_data *td;