Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95ed0681 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: merge blk_mq_drain_queue and __blk_mq_drain_queue 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8f5280f4

block/blk-mq.c

+2 −7
Original line number Diff line number Diff line
@@ -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)