History

block: remove unnecessary argument from blk_execute_rq_nowait

The 'q' is not used since commit a1ce35fa4985 ("block: remove dead elevator code"), also update the comment of the function. And more importantly it never really was needed to start with given that we can trivial derive it from struct request.

Guoqing Jiang committed 5 years ago

Commit 8eeed0b1 parent 0f7b4bc11 files · +17 −21Browse files

Unified · Split

11 files
  1. block/blk-exec.c +4 −6
  2. drivers/block/sx8.c +2 −2
  3. drivers/nvme/host/core.c +2 −2
  4. drivers/nvme/host/lightnvm.c +1 −1
  5. drivers/nvme/host/pci.c +2 −2
  6. drivers/nvme/target/passthru.c +1 −1
  7. drivers/scsi/scsi_error.c +1 −1
  8. drivers/scsi/sg.c +1 −2
  9. drivers/scsi/st.c +1 −1
  10. drivers/target/target_core_pscsi.c +1 −2
  11. include/linux/blkdev.h +1 −1
block/blk-exec.c+4−6
@@ -31,8 +31,7 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) · 30 unmodified lines
31}31}
32 32
33/**33/**
34 * blk_execute_rq_nowait - insert a request into queue for execution34 * blk_execute_rq_nowait - insert a request to I/O scheduler for execution
35 * @q: queue to insert the request in
36 * @bd_disk: matching gendisk35 * @bd_disk: matching gendisk
37 * @rq: request to insert36 * @rq: request to insert
38 * @at_head: insert request at head or tail of queue37 * @at_head: insert request at head or tail of queue
@@ -45,9 +44,8 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) · 6 unmodified lines
45 * Note:44 * Note:
46 * This function will invoke @done directly if the queue is dead.45 * This function will invoke @done directly if the queue is dead.
47 */46 */
48void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,47void blk_execute_rq_nowait(struct gendisk *bd_disk, struct request *rq,
49 struct request *rq, int at_head,48 int at_head, rq_end_io_fn *done)
50 rq_end_io_fn *done)
51{49{
52 WARN_ON(irqs_disabled());50 WARN_ON(irqs_disabled());
53 WARN_ON(!blk_rq_is_passthrough(rq));51 WARN_ON(!blk_rq_is_passthrough(rq));
@@ -83,7 +81,7 @@ void blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk, · 29 unmodified lines
83 unsigned long hang_check;81 unsigned long hang_check;
84 82
85 rq->end_io_data = &wait;83 rq->end_io_data = &wait;
86 blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq);84 blk_execute_rq_nowait(bd_disk, rq, at_head, blk_end_sync_rq);
87 85
88 /* Prevent hang_check timer from firing at us during very long I/O */86 /* Prevent hang_check timer from firing at us during very long I/O */
89 hang_check = sysctl_hung_task_timeout_secs;87 hang_check = sysctl_hung_task_timeout_secs;
drivers/block/sx8.c+2−2
@@ -539,7 +539,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx) · 538 unmodified lines
539 spin_unlock_irq(&host->lock);539 spin_unlock_irq(&host->lock);
540 540
541 DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag);541 DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag);
542 blk_execute_rq_nowait(host->oob_q, NULL, rq, true, NULL);542 blk_execute_rq_nowait(NULL, rq, true, NULL);
543 543
544 return 0;544 return 0;
545 545
@@ -578,7 +578,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) · 32 unmodified lines
578 crq->msg_bucket = (u32) rc;578 crq->msg_bucket = (u32) rc;
579 579
580 DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag);580 DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag);
581 blk_execute_rq_nowait(host->oob_q, NULL, rq, true, NULL);581 blk_execute_rq_nowait(NULL, rq, true, NULL);
582 582
583 return 0;583 return 0;
584}584}
drivers/nvme/host/core.c+2−2
@@ -925,7 +925,7 @@ static void nvme_execute_rq_polled(struct request_queue *q, · 924 unmodified lines
925 925
926 rq->cmd_flags |= REQ_HIPRI;926 rq->cmd_flags |= REQ_HIPRI;
927 rq->end_io_data = &wait;927 rq->end_io_data = &wait;
928 blk_execute_rq_nowait(q, bd_disk, rq, at_head, nvme_end_sync_rq);928 blk_execute_rq_nowait(bd_disk, rq, at_head, nvme_end_sync_rq);
929 929
930 while (!completion_done(&wait)) {930 while (!completion_done(&wait)) {
931 blk_poll(q, request_to_qc_t(rq->mq_hctx, rq), true);931 blk_poll(q, request_to_qc_t(rq->mq_hctx, rq), true);
@@ -1202,7 +1202,7 @@ static int nvme_keep_alive(struct nvme_ctrl *ctrl) · 270 unmodified lines
1202 rq->timeout = ctrl->kato * HZ;1202 rq->timeout = ctrl->kato * HZ;
1203 rq->end_io_data = ctrl;1203 rq->end_io_data = ctrl;
1204 1204
1205 blk_execute_rq_nowait(rq->q, NULL, rq, 0, nvme_keep_alive_end_io);1205 blk_execute_rq_nowait(NULL, rq, 0, nvme_keep_alive_end_io);
1206 1206
1207 return 0;1207 return 0;
1208}1208}
drivers/nvme/host/lightnvm.c+1−1
@@ -695,7 +695,7 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd, · 694 unmodified lines
695 695
696 rq->end_io_data = rqd;696 rq->end_io_data = rqd;
697 697
698 blk_execute_rq_nowait(q, NULL, rq, 0, nvme_nvm_end_io);698 blk_execute_rq_nowait(NULL, rq, 0, nvme_nvm_end_io);
699 699
700 return 0;700 return 0;
701 701
drivers/nvme/host/pci.c+2−2
@@ -1357,7 +1357,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) · 1356 unmodified lines
1357 }1357 }
1358 1358
1359 abort_req->end_io_data = NULL;1359 abort_req->end_io_data = NULL;
1360 blk_execute_rq_nowait(abort_req->q, NULL, abort_req, 0, abort_endio);1360 blk_execute_rq_nowait(NULL, abort_req, 0, abort_endio);
1361 1361
1362 /*1362 /*
1363 * The aborted req will be completed on receiving the abort req.1363 * The aborted req will be completed on receiving the abort req.
@@ -2281,7 +2281,7 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) · 917 unmodified lines
2281 req->end_io_data = nvmeq;2281 req->end_io_data = nvmeq;
2282 2282
2283 init_completion(&nvmeq->delete_done);2283 init_completion(&nvmeq->delete_done);
2284 blk_execute_rq_nowait(q, NULL, req, false,2284 blk_execute_rq_nowait(NULL, req, false,
2285 opcode == nvme_admin_delete_cq ?2285 opcode == nvme_admin_delete_cq ?
2286 nvme_del_cq_end : nvme_del_queue_end);2286 nvme_del_cq_end : nvme_del_queue_end);
2287 return 0;2287 return 0;
drivers/nvme/target/passthru.c+1−1
@@ -275,7 +275,7 @@ static void nvmet_passthru_execute_cmd(struct nvmet_req *req) · 274 unmodified lines
275 schedule_work(&req->p.work);275 schedule_work(&req->p.work);
276 } else {276 } else {
277 rq->end_io_data = req;277 rq->end_io_data = req;
278 blk_execute_rq_nowait(rq->q, ns ? ns->disk : NULL, rq, 0,278 blk_execute_rq_nowait(ns ? ns->disk : NULL, rq, 0,
279 nvmet_passthru_req_done);279 nvmet_passthru_req_done);
280 }280 }
281 281
drivers/scsi/scsi_error.c+1−1
@@ -2007,7 +2007,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) · 2006 unmodified lines
2007 req->timeout = 10 * HZ;2007 req->timeout = 10 * HZ;
2008 rq->retries = 5;2008 rq->retries = 5;
2009 2009
2010 blk_execute_rq_nowait(req->q, NULL, req, 1, eh_lock_door_done);2010 blk_execute_rq_nowait(NULL, req, 1, eh_lock_door_done);
2011}2011}
2012 2012
2013/**2013/**
drivers/scsi/sg.c+1−2
@@ -829,8 +829,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, · 828 unmodified lines
829 829
830 srp->rq->timeout = timeout;830 srp->rq->timeout = timeout;
831 kref_get(&sfp->f_ref); /* sg_rq_end_io() does kref_put(). */831 kref_get(&sfp->f_ref); /* sg_rq_end_io() does kref_put(). */
832 blk_execute_rq_nowait(sdp->device->request_queue, sdp->disk,832 blk_execute_rq_nowait(sdp->disk, srp->rq, at_head, sg_rq_end_io);
833 srp->rq, at_head, sg_rq_end_io);
834 return 0;833 return 0;
835}834}
836 835
drivers/scsi/st.c+1−1
@@ -585,7 +585,7 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, · 584 unmodified lines
585 rq->retries = retries;585 rq->retries = retries;
586 req->end_io_data = SRpnt;586 req->end_io_data = SRpnt;
587 587
588 blk_execute_rq_nowait(req->q, NULL, req, 1, st_scsi_execute_end);588 blk_execute_rq_nowait(NULL, req, 1, st_scsi_execute_end);
589 return 0;589 return 0;
590}590}
591 591
drivers/target/target_core_pscsi.c+1−2
@@ -1000,8 +1000,7 @@ pscsi_execute_cmd(struct se_cmd *cmd) · 999 unmodified lines
1000 req->timeout = PS_TIMEOUT_OTHER;1000 req->timeout = PS_TIMEOUT_OTHER;
1001 scsi_req(req)->retries = PS_RETRY;1001 scsi_req(req)->retries = PS_RETRY;
1002 1002
1003 blk_execute_rq_nowait(pdv->pdv_sd->request_queue, NULL, req,1003 blk_execute_rq_nowait(NULL, req, (cmd->sam_task_attr == TCM_HEAD_TAG),
1004 (cmd->sam_task_attr == TCM_HEAD_TAG),
1005 pscsi_req_done);1004 pscsi_req_done);
1006 1005
1007 return 0;1006 return 0;
include/linux/blkdev.h+1−1
@@ -950,7 +950,7 @@ extern int blk_rq_map_user_iov(struct request_queue *, struct request *, · 949 unmodified lines
950 gfp_t);950 gfp_t);
951extern void blk_execute_rq(struct request_queue *, struct gendisk *,951extern void blk_execute_rq(struct request_queue *, struct gendisk *,
952 struct request *, int);952 struct request *, int);
953extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,953extern void blk_execute_rq_nowait(struct gendisk *,
954 struct request *, int, rq_end_io_fn *);954 struct request *, int, rq_end_io_fn *);
955 955
956/* Helper to convert REQ_OP_XXX to its string format XXX */956/* Helper to convert REQ_OP_XXX to its string format XXX */