Commit 9b7dd572 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

blk-mq: Remove blk_mq_cancel_requeue_work() 



Since blk_mq_requeue_work() no longer restarts stopped queues
canceling requeue work is no longer needed to prevent that a
stopped queue would be restarted. Hence remove this function.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 52d7f1b5

block/blk-mq.c

+0 −6
Original line number Diff line number Diff line
@@ -526,12 +526,6 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head) 
}

EXPORT_SYMBOL(blk_mq_add_to_requeue_list);



void blk_mq_cancel_requeue_work(struct request_queue *q)

{

	cancel_delayed_work_sync(&q->requeue_work);

}

EXPORT_SYMBOL_GPL(blk_mq_cancel_requeue_work);



void blk_mq_kick_requeue_list(struct request_queue *q)

{

	kblockd_schedule_delayed_work(&q->requeue_work, 0);

drivers/md/dm-rq.c

+0 −2
Original line number Diff line number Diff line
@@ -116,8 +116,6 @@ static void dm_mq_stop_queue(struct request_queue *q) 
	queue_flag_set(QUEUE_FLAG_STOPPED, q);

	spin_unlock_irqrestore(q->queue_lock, flags);



	/* Avoid that requeuing could restart the queue. */

	blk_mq_cancel_requeue_work(q);

	blk_mq_stop_hw_queues(q);

}

drivers/nvme/host/core.c

+0 −1
Original line number Diff line number Diff line
@@ -2081,7 +2081,6 @@ void nvme_stop_queues(struct nvme_ctrl *ctrl) 
		queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue);

		spin_unlock_irq(ns->queue->queue_lock);



		blk_mq_cancel_requeue_work(ns->queue);

		blk_mq_stop_hw_queues(ns->queue);

	}

	mutex_unlock(&ctrl->namespaces_mutex);

include/linux/blk-mq.h

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ void __blk_mq_end_request(struct request *rq, int error); 


void blk_mq_requeue_request(struct request *rq);

void blk_mq_add_to_requeue_list(struct request *rq, bool at_head);

void blk_mq_cancel_requeue_work(struct request_queue *q);

void blk_mq_kick_requeue_list(struct request_queue *q);

void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs);

void blk_mq_abort_requeue_list(struct request_queue *q);

CRA Git | Maintained and supported by SUSTech CRA and CCSE