diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-06-13 19:43:35 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-06-13 20:17:40 +0200 |
| commit | 95ed068165d8edf6a81f9a73df0bb05c38602c3c (patch) | |
| tree | 465384acaf1784069dbbe1308e37ee854fe2f973 /block | |
| parent | blk-mq: properly drain stopped queues (diff) | |
| download | linux-95ed068165d8edf6a81f9a73df0bb05c38602c3c.tar.xz linux-95ed068165d8edf6a81f9a73df0bb05c38602c3c.zip | |
blk-mq: merge blk_mq_drain_queue and __blk_mq_drain_queue
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index fd8b485d1288..0ef2dc7f01bf 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -109,7 +109,7 @@ static void blk_mq_queue_exit(struct request_queue *q) __percpu_counter_add(&q->mq_usage_counter, -1, 1000000); } -static void __blk_mq_drain_queue(struct request_queue *q) +void blk_mq_drain_queue(struct request_queue *q) { while (true) { s64 count; @@ -139,12 +139,7 @@ static void blk_mq_freeze_queue(struct request_queue *q) spin_unlock_irq(q->queue_lock); if (drain) - __blk_mq_drain_queue(q); -} - -void blk_mq_drain_queue(struct request_queue *q) -{ - __blk_mq_drain_queue(q); + blk_mq_drain_queue(q); } static void blk_mq_unfreeze_queue(struct request_queue *q) |