Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Cc: target-devel@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Cc: linux-ide@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-nvme@lists.infradead.org
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Guoqing Jiang and committed by
Jens Axboe
8eeed0b5 0f7b4bc6

+17 -21
+4 -6
block/blk-exec.c
··· 31 31 } 32 32 33 33 /** 34 - * blk_execute_rq_nowait - insert a request into queue for execution 35 - * @q: queue to insert the request in 34 + * blk_execute_rq_nowait - insert a request to I/O scheduler for execution 36 35 * @bd_disk: matching gendisk 37 36 * @rq: request to insert 38 37 * @at_head: insert request at head or tail of queue ··· 44 45 * Note: 45 46 * This function will invoke @done directly if the queue is dead. 46 47 */ 47 - void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 48 - struct request *rq, int at_head, 49 - rq_end_io_fn *done) 48 + void blk_execute_rq_nowait(struct gendisk *bd_disk, struct request *rq, 49 + int at_head, rq_end_io_fn *done) 50 50 { 51 51 WARN_ON(irqs_disabled()); 52 52 WARN_ON(!blk_rq_is_passthrough(rq)); ··· 81 83 unsigned long hang_check; 82 84 83 85 rq->end_io_data = &wait; 84 - blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq); 86 + blk_execute_rq_nowait(bd_disk, rq, at_head, blk_end_sync_rq); 85 87 86 88 /* Prevent hang_check timer from firing at us during very long I/O */ 87 89 hang_check = sysctl_hung_task_timeout_secs;
+2 -2
drivers/block/sx8.c
··· 539 539 spin_unlock_irq(&host->lock); 540 540 541 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 544 return 0; 545 545 ··· 578 578 crq->msg_bucket = (u32) rc; 579 579 580 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 583 return 0; 584 584 }
+2 -2
drivers/nvme/host/core.c
··· 925 925 926 926 rq->cmd_flags |= REQ_HIPRI; 927 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 930 while (!completion_done(&wait)) { 931 931 blk_poll(q, request_to_qc_t(rq->mq_hctx, rq), true); ··· 1202 1202 rq->timeout = ctrl->kato * HZ; 1203 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 1207 return 0; 1208 1208 }
+1 -1
drivers/nvme/host/lightnvm.c
··· 695 695 696 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 700 return 0; 701 701
+2 -2
drivers/nvme/host/pci.c
··· 1357 1357 } 1358 1358 1359 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 1363 * The aborted req will be completed on receiving the abort req. ··· 2281 2281 req->end_io_data = nvmeq; 2282 2282 2283 2283 init_completion(&nvmeq->delete_done); 2284 - blk_execute_rq_nowait(q, NULL, req, false, 2284 + blk_execute_rq_nowait(NULL, req, false, 2285 2285 opcode == nvme_admin_delete_cq ? 2286 2286 nvme_del_cq_end : nvme_del_queue_end); 2287 2287 return 0;
+1 -1
drivers/nvme/target/passthru.c
··· 275 275 schedule_work(&req->p.work); 276 276 } else { 277 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 279 nvmet_passthru_req_done); 280 280 } 281 281
+1 -1
drivers/scsi/scsi_error.c
··· 2007 2007 req->timeout = 10 * HZ; 2008 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 /**
+1 -2
drivers/scsi/sg.c
··· 829 829 830 830 srp->rq->timeout = timeout; 831 831 kref_get(&sfp->f_ref); /* sg_rq_end_io() does kref_put(). */ 832 - blk_execute_rq_nowait(sdp->device->request_queue, sdp->disk, 833 - srp->rq, at_head, sg_rq_end_io); 832 + blk_execute_rq_nowait(sdp->disk, srp->rq, at_head, sg_rq_end_io); 834 833 return 0; 835 834 } 836 835
+1 -1
drivers/scsi/st.c
··· 585 585 rq->retries = retries; 586 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 589 return 0; 590 590 } 591 591
+1 -2
drivers/target/target_core_pscsi.c
··· 1000 1000 req->timeout = PS_TIMEOUT_OTHER; 1001 1001 scsi_req(req)->retries = PS_RETRY; 1002 1002 1003 - blk_execute_rq_nowait(pdv->pdv_sd->request_queue, NULL, req, 1004 - (cmd->sam_task_attr == TCM_HEAD_TAG), 1003 + blk_execute_rq_nowait(NULL, req, (cmd->sam_task_attr == TCM_HEAD_TAG), 1005 1004 pscsi_req_done); 1006 1005 1007 1006 return 0;
+1 -1
include/linux/blkdev.h
··· 950 950 gfp_t); 951 951 extern void blk_execute_rq(struct request_queue *, struct gendisk *, 952 952 struct request *, int); 953 - extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *, 953 + extern void blk_execute_rq_nowait(struct gendisk *, 954 954 struct request *, int, rq_end_io_fn *); 955 955 956 956 /* Helper to convert REQ_OP_XXX to its string format XXX */