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

Commit 59c3d45e authored by Jens Axboe's avatar Jens Axboe
Browse files

block: remove 'q' parameter from kblockd_schedule_*_work()



The queue parameter is never used, just get rid of it.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e69f18f0
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -2904,14 +2904,14 @@ free_and_out:
}
EXPORT_SYMBOL_GPL(blk_rq_prep_clone);

int kblockd_schedule_work(struct request_queue *q, struct work_struct *work)
int kblockd_schedule_work(struct work_struct *work)
{
	return queue_work(kblockd_workqueue, work);
}
EXPORT_SYMBOL(kblockd_schedule_work);

int kblockd_schedule_delayed_work(struct request_queue *q,
			struct delayed_work *dwork, unsigned long delay)
int kblockd_schedule_delayed_work(struct delayed_work *dwork,
				  unsigned long delay)
{
	return queue_delayed_work(kblockd_workqueue, dwork, delay);
}
+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static bool blk_flush_queue_rq(struct request *rq, bool add_front)
{
	if (rq->q->mq_ops) {
		INIT_WORK(&rq->mq_flush_work, mq_flush_run);
		kblockd_schedule_work(rq->q, &rq->mq_flush_work);
		kblockd_schedule_work(&rq->mq_flush_work);
		return false;
	} else {
		if (add_front)
+2 −5
Original line number Diff line number Diff line
@@ -608,11 +608,8 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)

	if (!async)
		__blk_mq_run_hw_queue(hctx);
	else {
		struct request_queue *q = hctx->queue;

		kblockd_schedule_delayed_work(q, &hctx->delayed_work, 0);
	}
	else
		kblockd_schedule_delayed_work(&hctx->delayed_work, 0);
}

void blk_mq_run_queues(struct request_queue *q, bool async)
+1 −1
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)
{
	if (cfqd->busy_queues) {
		cfq_log(cfqd, "schedule dispatch");
		kblockd_schedule_work(cfqd->queue, &cfqd->unplug_work);
		kblockd_schedule_work(&cfqd->unplug_work);
	}
}

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
	 */
	spin_lock_irqsave(q->queue_lock, flags);
	blk_requeue_request(q, cmd->request);
	kblockd_schedule_work(q, &device->requeue_work);
	kblockd_schedule_work(&device->requeue_work);
	spin_unlock_irqrestore(q->queue_lock, flags);
}

Loading