UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Jens Axboe 2014-04-08 09:15:35 -06:00
parent e69f18f06b
commit 59c3d45e48
6 changed files with 10 additions and 13 deletions

6
block/blk-core.c
View File

@ -2904,14 +2904,14 @@ free_and_out:
} }
EXPORT_SYMBOL_GPL(blk_rq_prep_clone); 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); return queue_work(kblockd_workqueue, work);
} }
EXPORT_SYMBOL(kblockd_schedule_work); EXPORT_SYMBOL(kblockd_schedule_work);
int kblockd_schedule_delayed_work(struct request_queue *q, int kblockd_schedule_delayed_work(struct delayed_work *dwork,
struct delayed_work *dwork, unsigned long delay) unsigned long delay)
{ {
return queue_delayed_work(kblockd_workqueue, dwork, delay); return queue_delayed_work(kblockd_workqueue, dwork, delay);
} }

2
block/blk-flush.c
View File

@ -144,7 +144,7 @@ static bool blk_flush_queue_rq(struct request *rq, bool add_front)
{ {
if (rq->q->mq_ops) { if (rq->q->mq_ops) {
INIT_WORK(&rq->mq_flush_work, mq_flush_run); 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; return false;
} else { } else {
if (add_front) if (add_front)

7
block/blk-mq.c
View File

@ -608,11 +608,8 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
if (!async) if (!async)
__blk_mq_run_hw_queue(hctx); __blk_mq_run_hw_queue(hctx);
else { else
struct request_queue *q = hctx->queue; kblockd_schedule_delayed_work(&hctx->delayed_work, 0);
kblockd_schedule_delayed_work(q, &hctx->delayed_work, 0);
}
} }
void blk_mq_run_queues(struct request_queue *q, bool async) void blk_mq_run_queues(struct request_queue *q, bool async)

2
block/cfq-iosched.c
View File

@ -908,7 +908,7 @@ static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)
{ {
if (cfqd->busy_queues) { if (cfqd->busy_queues) {
cfq_log(cfqd, "schedule dispatch"); cfq_log(cfqd, "schedule dispatch");
kblockd_schedule_work(cfqd->queue, &cfqd->unplug_work); kblockd_schedule_work(&cfqd->unplug_work);
} }
} }

2
drivers/scsi/scsi_lib.c
View File

@ -139,7 +139,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
*/ */
spin_lock_irqsave(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_requeue_request(q, cmd->request); 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); spin_unlock_irqrestore(q->queue_lock, flags);
} }

4
include/linux/blkdev.h
View File

@ -1359,8 +1359,8 @@ static inline void put_dev_sector(Sector p)
} }
struct work_struct; struct work_struct;
int kblockd_schedule_work(struct request_queue *q, struct work_struct *work); int kblockd_schedule_work(struct work_struct *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);
#ifdef CONFIG_BLK_CGROUP #ifdef CONFIG_BLK_CGROUP
/* /*