* Re: [PATCH] block: remove unused parameter
2025-03-13 3:53 ` [PATCH] block: remove unused parameter Anuj Gupta
@ 2025-03-13 6:30 ` Christoph Hellwig
2025-03-13 12:15 ` Ulf Hansson
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2025-03-13 6:30 UTC (permalink / raw)
To: Anuj Gupta
Cc: Jens Axboe, Md. Haris Iqbal, Jack Wang, Michael S. Tsirkin,
Jason Wang, Xuan Zhuo, Eugenio Pérez, Paolo Bonzini,
Stefan Hajnoczi, Roger Pau Monné, Juergen Gross,
Stefano Stabellini, Oleksandr Tyshchenko, Maxim Levitsky,
Alex Dubov, Ulf Hansson, Richard Weinberger, Zhihao Cheng,
Miquel Raynal, Vignesh Raghavendra, Sven Peter, Janne Grunau,
Alyssa Rosenzweig, Keith Busch, Sagi Grimberg, James Smart,
Chaitanya Kulkarni, James E.J. Bottomley, Martin K. Petersen,
linux-block, linux-kernel, virtualization, xen-devel, linux-mmc,
linux-mtd, asahi, linux-arm-kernel, linux-nvme, linux-scsi
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] block: remove unused parameter
2025-03-13 3:53 ` [PATCH] block: remove unused parameter Anuj Gupta
2025-03-13 6:30 ` Christoph Hellwig
@ 2025-03-13 12:15 ` Ulf Hansson
2025-03-13 12:17 ` Jinpu Wang
2025-03-13 13:24 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Ulf Hansson @ 2025-03-13 12:15 UTC (permalink / raw)
To: Anuj Gupta
Cc: Jens Axboe, Md. Haris Iqbal, Jack Wang, Michael S. Tsirkin,
Jason Wang, Xuan Zhuo, Eugenio Pérez, Paolo Bonzini,
Stefan Hajnoczi, Roger Pau Monné, Juergen Gross,
Stefano Stabellini, Oleksandr Tyshchenko, Maxim Levitsky,
Alex Dubov, Richard Weinberger, Zhihao Cheng, Miquel Raynal,
Vignesh Raghavendra, Sven Peter, Janne Grunau, Alyssa Rosenzweig,
Keith Busch, Christoph Hellwig, Sagi Grimberg, James Smart,
Chaitanya Kulkarni, James E.J. Bottomley, Martin K. Petersen,
linux-block, linux-kernel, virtualization, xen-devel, linux-mmc,
linux-mtd, asahi, linux-arm-kernel, linux-nvme, linux-scsi
On Thu, 13 Mar 2025 at 06:13, Anuj Gupta <anuj20.g@samsung.com> wrote:
>
> request_queue param is not used by blk_rq_map_sg and __blk_rq_map_sg.
> remove it.
>
> Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC/MEMSTICK
> ---
> block/blk-merge.c | 4 ++--
> block/bsg-lib.c | 2 +-
> drivers/block/mtip32xx/mtip32xx.c | 2 +-
> drivers/block/rnbd/rnbd-clt.c | 2 +-
> drivers/block/sunvdc.c | 2 +-
> drivers/block/virtio_blk.c | 2 +-
> drivers/block/xen-blkfront.c | 2 +-
> drivers/memstick/core/ms_block.c | 2 +-
> drivers/memstick/core/mspro_block.c | 4 +---
> drivers/mmc/core/queue.c | 2 +-
> drivers/mtd/ubi/block.c | 2 +-
> drivers/nvme/host/apple.c | 2 +-
> drivers/nvme/host/fc.c | 2 +-
> drivers/nvme/host/pci.c | 2 +-
> drivers/nvme/host/rdma.c | 3 +--
> drivers/nvme/target/loop.c | 2 +-
> drivers/scsi/scsi_lib.c | 2 +-
> include/linux/blk-mq.h | 9 ++++-----
> 18 files changed, 22 insertions(+), 26 deletions(-)
>
> diff --git a/block/blk-merge.c b/block/blk-merge.c
> index 1d1589c35297..fdd4efb54c6c 100644
> --- a/block/blk-merge.c
> +++ b/block/blk-merge.c
> @@ -551,8 +551,8 @@ static inline struct scatterlist *blk_next_sg(struct scatterlist **sg,
> * Map a request to scatterlist, return number of sg entries setup. Caller
> * must make sure sg can hold rq->nr_phys_segments entries.
> */
> -int __blk_rq_map_sg(struct request_queue *q, struct request *rq,
> - struct scatterlist *sglist, struct scatterlist **last_sg)
> +int __blk_rq_map_sg(struct request *rq, struct scatterlist *sglist,
> + struct scatterlist **last_sg)
> {
> struct req_iterator iter = {
> .bio = rq->bio,
> diff --git a/block/bsg-lib.c b/block/bsg-lib.c
> index 93523d8f8195..9ceb5d0832f5 100644
> --- a/block/bsg-lib.c
> +++ b/block/bsg-lib.c
> @@ -219,7 +219,7 @@ static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req)
> if (!buf->sg_list)
> return -ENOMEM;
> sg_init_table(buf->sg_list, req->nr_phys_segments);
> - buf->sg_cnt = blk_rq_map_sg(req->q, req, buf->sg_list);
> + buf->sg_cnt = blk_rq_map_sg(req, buf->sg_list);
> buf->payload_len = blk_rq_bytes(req);
> return 0;
> }
> diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
> index 95361099a2dc..0d619df03fa9 100644
> --- a/drivers/block/mtip32xx/mtip32xx.c
> +++ b/drivers/block/mtip32xx/mtip32xx.c
> @@ -2056,7 +2056,7 @@ static void mtip_hw_submit_io(struct driver_data *dd, struct request *rq,
> unsigned int nents;
>
> /* Map the scatter list for DMA access */
> - nents = blk_rq_map_sg(hctx->queue, rq, command->sg);
> + nents = blk_rq_map_sg(rq, command->sg);
> nents = dma_map_sg(&dd->pdev->dev, command->sg, nents, dma_dir);
>
> prefetch(&port->flags);
> diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
> index 82467ecde7ec..15627417f12e 100644
> --- a/drivers/block/rnbd/rnbd-clt.c
> +++ b/drivers/block/rnbd/rnbd-clt.c
> @@ -1010,7 +1010,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev,
> * See queue limits.
> */
> if ((req_op(rq) != REQ_OP_DISCARD) && (req_op(rq) != REQ_OP_WRITE_ZEROES))
> - sg_cnt = blk_rq_map_sg(dev->queue, rq, iu->sgt.sgl);
> + sg_cnt = blk_rq_map_sg(rq, iu->sgt.sgl);
>
> if (sg_cnt == 0)
> sg_mark_end(&iu->sgt.sgl[0]);
> diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
> index 282f81616a78..2b33fb5b949b 100644
> --- a/drivers/block/sunvdc.c
> +++ b/drivers/block/sunvdc.c
> @@ -485,7 +485,7 @@ static int __send_request(struct request *req)
> }
>
> sg_init_table(sg, port->ring_cookies);
> - nsg = blk_rq_map_sg(req->q, req, sg);
> + nsg = blk_rq_map_sg(req, sg);
>
> len = 0;
> for (i = 0; i < nsg; i++)
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 6a61ec35f426..a3df4d49bd46 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -226,7 +226,7 @@ static int virtblk_map_data(struct blk_mq_hw_ctx *hctx, struct request *req,
> if (unlikely(err))
> return -ENOMEM;
>
> - return blk_rq_map_sg(hctx->queue, req, vbr->sg_table.sgl);
> + return blk_rq_map_sg(req, vbr->sg_table.sgl);
> }
>
> static void virtblk_cleanup_cmd(struct request *req)
> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> index edcd08a9dcef..5babe575c288 100644
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@ -751,7 +751,7 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
> id = blkif_ring_get_request(rinfo, req, &final_ring_req);
> ring_req = &rinfo->shadow[id].req;
>
> - num_sg = blk_rq_map_sg(req->q, req, rinfo->shadow[id].sg);
> + num_sg = blk_rq_map_sg(req, rinfo->shadow[id].sg);
> num_grant = 0;
> /* Calculate the number of grant used */
> for_each_sg(rinfo->shadow[id].sg, sg, num_sg, i)
> diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
> index 5b617c1f6789..f4398383ae06 100644
> --- a/drivers/memstick/core/ms_block.c
> +++ b/drivers/memstick/core/ms_block.c
> @@ -1904,7 +1904,7 @@ static void msb_io_work(struct work_struct *work)
>
> /* process the request */
> dbg_verbose("IO: processing new request");
> - blk_rq_map_sg(msb->queue, req, sg);
> + blk_rq_map_sg(req, sg);
>
> lba = blk_rq_pos(req);
>
> diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
> index 634d343b6bdb..c9853d887d28 100644
> --- a/drivers/memstick/core/mspro_block.c
> +++ b/drivers/memstick/core/mspro_block.c
> @@ -627,9 +627,7 @@ static int mspro_block_issue_req(struct memstick_dev *card)
> while (true) {
> msb->current_page = 0;
> msb->current_seg = 0;
> - msb->seg_count = blk_rq_map_sg(msb->block_req->q,
> - msb->block_req,
> - msb->req_sg);
> + msb->seg_count = blk_rq_map_sg(msb->block_req, msb->req_sg);
>
> if (!msb->seg_count) {
> unsigned int bytes = blk_rq_cur_bytes(msb->block_req);
> diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
> index ab662f502fe7..3ba62f825b84 100644
> --- a/drivers/mmc/core/queue.c
> +++ b/drivers/mmc/core/queue.c
> @@ -523,5 +523,5 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq, struct mmc_queue_req *mqrq)
> {
> struct request *req = mmc_queue_req_to_req(mqrq);
>
> - return blk_rq_map_sg(mq->queue, req, mqrq->sg);
> + return blk_rq_map_sg(req, mqrq->sg);
> }
> diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
> index 2836905f0152..39cc0a6a4d37 100644
> --- a/drivers/mtd/ubi/block.c
> +++ b/drivers/mtd/ubi/block.c
> @@ -199,7 +199,7 @@ static blk_status_t ubiblock_read(struct request *req)
> * and ubi_read_sg() will check that limit.
> */
> ubi_sgl_init(&pdu->usgl);
> - blk_rq_map_sg(req->q, req, pdu->usgl.sg);
> + blk_rq_map_sg(req, pdu->usgl.sg);
>
> while (bytes_left) {
> /*
> diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
> index a060f69558e7..a437eee741e1 100644
> --- a/drivers/nvme/host/apple.c
> +++ b/drivers/nvme/host/apple.c
> @@ -525,7 +525,7 @@ static blk_status_t apple_nvme_map_data(struct apple_nvme *anv,
> if (!iod->sg)
> return BLK_STS_RESOURCE;
> sg_init_table(iod->sg, blk_rq_nr_phys_segments(req));
> - iod->nents = blk_rq_map_sg(req->q, req, iod->sg);
> + iod->nents = blk_rq_map_sg(req, iod->sg);
> if (!iod->nents)
> goto out_free_sg;
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index b9929a5a7f4e..1b5ad1173bc7 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2571,7 +2571,7 @@ nvme_fc_map_data(struct nvme_fc_ctrl *ctrl, struct request *rq,
> if (ret)
> return -ENOMEM;
>
> - op->nents = blk_rq_map_sg(rq->q, rq, freq->sg_table.sgl);
> + op->nents = blk_rq_map_sg(rq, freq->sg_table.sgl);
> WARN_ON(op->nents > blk_rq_nr_phys_segments(rq));
> freq->sg_cnt = fc_dma_map_sg(ctrl->lport->dev, freq->sg_table.sgl,
> op->nents, rq_dma_dir(rq));
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 950289405ef2..a0b1c57067aa 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -812,7 +812,7 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
> if (!iod->sgt.sgl)
> return BLK_STS_RESOURCE;
> sg_init_table(iod->sgt.sgl, blk_rq_nr_phys_segments(req));
> - iod->sgt.orig_nents = blk_rq_map_sg(req->q, req, iod->sgt.sgl);
> + iod->sgt.orig_nents = blk_rq_map_sg(req, iod->sgt.sgl);
> if (!iod->sgt.orig_nents)
> goto out_free_sg;
>
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 86a2891d9bcc..b5a0295b5bf4 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -1476,8 +1476,7 @@ static int nvme_rdma_dma_map_req(struct ib_device *ibdev, struct request *rq,
> if (ret)
> return -ENOMEM;
>
> - req->data_sgl.nents = blk_rq_map_sg(rq->q, rq,
> - req->data_sgl.sg_table.sgl);
> + req->data_sgl.nents = blk_rq_map_sg(rq, req->data_sgl.sg_table.sgl);
>
> *count = ib_dma_map_sg(ibdev, req->data_sgl.sg_table.sgl,
> req->data_sgl.nents, rq_dma_dir(rq));
> diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
> index a9d112d34d4f..a5c41144667c 100644
> --- a/drivers/nvme/target/loop.c
> +++ b/drivers/nvme/target/loop.c
> @@ -162,7 +162,7 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,
> }
>
> iod->req.sg = iod->sg_table.sgl;
> - iod->req.sg_cnt = blk_rq_map_sg(req->q, req, iod->sg_table.sgl);
> + iod->req.sg_cnt = blk_rq_map_sg(req, iod->sg_table.sgl);
> iod->req.transfer_len = blk_rq_payload_bytes(req);
> }
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index f1cfe0bb89b2..0d29470e86b0 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -1149,7 +1149,7 @@ blk_status_t scsi_alloc_sgtables(struct scsi_cmnd *cmd)
> * Next, walk the list, and fill in the addresses and sizes of
> * each segment.
> */
> - count = __blk_rq_map_sg(rq->q, rq, cmd->sdb.table.sgl, &last_sg);
> + count = __blk_rq_map_sg(rq, cmd->sdb.table.sgl, &last_sg);
>
> if (blk_rq_bytes(rq) & rq->q->limits.dma_pad_mask) {
> unsigned int pad_len =
> diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
> index fa2a76cc2f73..f2eff998913d 100644
> --- a/include/linux/blk-mq.h
> +++ b/include/linux/blk-mq.h
> @@ -1165,14 +1165,13 @@ static inline unsigned short blk_rq_nr_discard_segments(struct request *rq)
> return max_t(unsigned short, rq->nr_phys_segments, 1);
> }
>
> -int __blk_rq_map_sg(struct request_queue *q, struct request *rq,
> - struct scatterlist *sglist, struct scatterlist **last_sg);
> -static inline int blk_rq_map_sg(struct request_queue *q, struct request *rq,
> - struct scatterlist *sglist)
> +int __blk_rq_map_sg(struct request *rq, struct scatterlist *sglist,
> + struct scatterlist **last_sg);
> +static inline int blk_rq_map_sg(struct request *rq, struct scatterlist *sglist)
> {
> struct scatterlist *last_sg = NULL;
>
> - return __blk_rq_map_sg(q, rq, sglist, &last_sg);
> + return __blk_rq_map_sg(rq, sglist, &last_sg);
> }
> void blk_dump_rq_flags(struct request *, char *);
>
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] block: remove unused parameter
2025-03-13 3:53 ` [PATCH] block: remove unused parameter Anuj Gupta
2025-03-13 6:30 ` Christoph Hellwig
2025-03-13 12:15 ` Ulf Hansson
@ 2025-03-13 12:17 ` Jinpu Wang
2025-03-13 13:24 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Jinpu Wang @ 2025-03-13 12:17 UTC (permalink / raw)
To: Anuj Gupta
Cc: Jens Axboe, Md. Haris Iqbal, Michael S. Tsirkin, Jason Wang,
Xuan Zhuo, Eugenio Pérez, Paolo Bonzini, Stefan Hajnoczi,
Roger Pau Monné, Juergen Gross, Stefano Stabellini,
Oleksandr Tyshchenko, Maxim Levitsky, Alex Dubov, Ulf Hansson,
Richard Weinberger, Zhihao Cheng, Miquel Raynal,
Vignesh Raghavendra, Sven Peter, Janne Grunau, Alyssa Rosenzweig,
Keith Busch, Christoph Hellwig, Sagi Grimberg, James Smart,
Chaitanya Kulkarni, James E.J. Bottomley, Martin K. Petersen,
linux-block, linux-kernel, virtualization, xen-devel, linux-mmc,
linux-mtd, asahi, linux-arm-kernel, linux-nvme, linux-scsi
On Thu, Mar 13, 2025 at 6:14 AM Anuj Gupta <anuj20.g@samsung.com> wrote:
>
> request_queue param is not used by blk_rq_map_sg and __blk_rq_map_sg.
> remove it.
>
> Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
> ---
> block/blk-merge.c | 4 ++--
> block/bsg-lib.c | 2 +-
> drivers/block/mtip32xx/mtip32xx.c | 2 +-
> drivers/block/rnbd/rnbd-clt.c | 2 +-
lgtm.
Acked-by: Jack Wang <jinpu.wang@ionos.com> #rnbd
> drivers/block/sunvdc.c | 2 +-
> drivers/block/virtio_blk.c | 2 +-
> drivers/block/xen-blkfront.c | 2 +-
> drivers/memstick/core/ms_block.c | 2 +-
> drivers/memstick/core/mspro_block.c | 4 +---
> drivers/mmc/core/queue.c | 2 +-
> drivers/mtd/ubi/block.c | 2 +-
> drivers/nvme/host/apple.c | 2 +-
> drivers/nvme/host/fc.c | 2 +-
> drivers/nvme/host/pci.c | 2 +-
> drivers/nvme/host/rdma.c | 3 +--
> drivers/nvme/target/loop.c | 2 +-
> drivers/scsi/scsi_lib.c | 2 +-
> include/linux/blk-mq.h | 9 ++++-----
> 18 files changed, 22 insertions(+), 26 deletions(-)
>
> diff --git a/block/blk-merge.c b/block/blk-merge.c
> index 1d1589c35297..fdd4efb54c6c 100644
> --- a/block/blk-merge.c
> +++ b/block/blk-merge.c
> @@ -551,8 +551,8 @@ static inline struct scatterlist *blk_next_sg(struct scatterlist **sg,
> * Map a request to scatterlist, return number of sg entries setup. Caller
> * must make sure sg can hold rq->nr_phys_segments entries.
> */
> -int __blk_rq_map_sg(struct request_queue *q, struct request *rq,
> - struct scatterlist *sglist, struct scatterlist **last_sg)
> +int __blk_rq_map_sg(struct request *rq, struct scatterlist *sglist,
> + struct scatterlist **last_sg)
> {
> struct req_iterator iter = {
> .bio = rq->bio,
> diff --git a/block/bsg-lib.c b/block/bsg-lib.c
> index 93523d8f8195..9ceb5d0832f5 100644
> --- a/block/bsg-lib.c
> +++ b/block/bsg-lib.c
> @@ -219,7 +219,7 @@ static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req)
> if (!buf->sg_list)
> return -ENOMEM;
> sg_init_table(buf->sg_list, req->nr_phys_segments);
> - buf->sg_cnt = blk_rq_map_sg(req->q, req, buf->sg_list);
> + buf->sg_cnt = blk_rq_map_sg(req, buf->sg_list);
> buf->payload_len = blk_rq_bytes(req);
> return 0;
> }
> diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
> index 95361099a2dc..0d619df03fa9 100644
> --- a/drivers/block/mtip32xx/mtip32xx.c
> +++ b/drivers/block/mtip32xx/mtip32xx.c
> @@ -2056,7 +2056,7 @@ static void mtip_hw_submit_io(struct driver_data *dd, struct request *rq,
> unsigned int nents;
>
> /* Map the scatter list for DMA access */
> - nents = blk_rq_map_sg(hctx->queue, rq, command->sg);
> + nents = blk_rq_map_sg(rq, command->sg);
> nents = dma_map_sg(&dd->pdev->dev, command->sg, nents, dma_dir);
>
> prefetch(&port->flags);
> diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
> index 82467ecde7ec..15627417f12e 100644
> --- a/drivers/block/rnbd/rnbd-clt.c
> +++ b/drivers/block/rnbd/rnbd-clt.c
> @@ -1010,7 +1010,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev,
> * See queue limits.
> */
> if ((req_op(rq) != REQ_OP_DISCARD) && (req_op(rq) != REQ_OP_WRITE_ZEROES))
> - sg_cnt = blk_rq_map_sg(dev->queue, rq, iu->sgt.sgl);
> + sg_cnt = blk_rq_map_sg(rq, iu->sgt.sgl);
>
> if (sg_cnt == 0)
> sg_mark_end(&iu->sgt.sgl[0]);
> diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
> index 282f81616a78..2b33fb5b949b 100644
> --- a/drivers/block/sunvdc.c
> +++ b/drivers/block/sunvdc.c
> @@ -485,7 +485,7 @@ static int __send_request(struct request *req)
> }
>
> sg_init_table(sg, port->ring_cookies);
> - nsg = blk_rq_map_sg(req->q, req, sg);
> + nsg = blk_rq_map_sg(req, sg);
>
> len = 0;
> for (i = 0; i < nsg; i++)
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 6a61ec35f426..a3df4d49bd46 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -226,7 +226,7 @@ static int virtblk_map_data(struct blk_mq_hw_ctx *hctx, struct request *req,
> if (unlikely(err))
> return -ENOMEM;
>
> - return blk_rq_map_sg(hctx->queue, req, vbr->sg_table.sgl);
> + return blk_rq_map_sg(req, vbr->sg_table.sgl);
> }
>
> static void virtblk_cleanup_cmd(struct request *req)
> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> index edcd08a9dcef..5babe575c288 100644
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@ -751,7 +751,7 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
> id = blkif_ring_get_request(rinfo, req, &final_ring_req);
> ring_req = &rinfo->shadow[id].req;
>
> - num_sg = blk_rq_map_sg(req->q, req, rinfo->shadow[id].sg);
> + num_sg = blk_rq_map_sg(req, rinfo->shadow[id].sg);
> num_grant = 0;
> /* Calculate the number of grant used */
> for_each_sg(rinfo->shadow[id].sg, sg, num_sg, i)
> diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
> index 5b617c1f6789..f4398383ae06 100644
> --- a/drivers/memstick/core/ms_block.c
> +++ b/drivers/memstick/core/ms_block.c
> @@ -1904,7 +1904,7 @@ static void msb_io_work(struct work_struct *work)
>
> /* process the request */
> dbg_verbose("IO: processing new request");
> - blk_rq_map_sg(msb->queue, req, sg);
> + blk_rq_map_sg(req, sg);
>
> lba = blk_rq_pos(req);
>
> diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
> index 634d343b6bdb..c9853d887d28 100644
> --- a/drivers/memstick/core/mspro_block.c
> +++ b/drivers/memstick/core/mspro_block.c
> @@ -627,9 +627,7 @@ static int mspro_block_issue_req(struct memstick_dev *card)
> while (true) {
> msb->current_page = 0;
> msb->current_seg = 0;
> - msb->seg_count = blk_rq_map_sg(msb->block_req->q,
> - msb->block_req,
> - msb->req_sg);
> + msb->seg_count = blk_rq_map_sg(msb->block_req, msb->req_sg);
>
> if (!msb->seg_count) {
> unsigned int bytes = blk_rq_cur_bytes(msb->block_req);
> diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
> index ab662f502fe7..3ba62f825b84 100644
> --- a/drivers/mmc/core/queue.c
> +++ b/drivers/mmc/core/queue.c
> @@ -523,5 +523,5 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq, struct mmc_queue_req *mqrq)
> {
> struct request *req = mmc_queue_req_to_req(mqrq);
>
> - return blk_rq_map_sg(mq->queue, req, mqrq->sg);
> + return blk_rq_map_sg(req, mqrq->sg);
> }
> diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
> index 2836905f0152..39cc0a6a4d37 100644
> --- a/drivers/mtd/ubi/block.c
> +++ b/drivers/mtd/ubi/block.c
> @@ -199,7 +199,7 @@ static blk_status_t ubiblock_read(struct request *req)
> * and ubi_read_sg() will check that limit.
> */
> ubi_sgl_init(&pdu->usgl);
> - blk_rq_map_sg(req->q, req, pdu->usgl.sg);
> + blk_rq_map_sg(req, pdu->usgl.sg);
>
> while (bytes_left) {
> /*
> diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
> index a060f69558e7..a437eee741e1 100644
> --- a/drivers/nvme/host/apple.c
> +++ b/drivers/nvme/host/apple.c
> @@ -525,7 +525,7 @@ static blk_status_t apple_nvme_map_data(struct apple_nvme *anv,
> if (!iod->sg)
> return BLK_STS_RESOURCE;
> sg_init_table(iod->sg, blk_rq_nr_phys_segments(req));
> - iod->nents = blk_rq_map_sg(req->q, req, iod->sg);
> + iod->nents = blk_rq_map_sg(req, iod->sg);
> if (!iod->nents)
> goto out_free_sg;
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index b9929a5a7f4e..1b5ad1173bc7 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2571,7 +2571,7 @@ nvme_fc_map_data(struct nvme_fc_ctrl *ctrl, struct request *rq,
> if (ret)
> return -ENOMEM;
>
> - op->nents = blk_rq_map_sg(rq->q, rq, freq->sg_table.sgl);
> + op->nents = blk_rq_map_sg(rq, freq->sg_table.sgl);
> WARN_ON(op->nents > blk_rq_nr_phys_segments(rq));
> freq->sg_cnt = fc_dma_map_sg(ctrl->lport->dev, freq->sg_table.sgl,
> op->nents, rq_dma_dir(rq));
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 950289405ef2..a0b1c57067aa 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -812,7 +812,7 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
> if (!iod->sgt.sgl)
> return BLK_STS_RESOURCE;
> sg_init_table(iod->sgt.sgl, blk_rq_nr_phys_segments(req));
> - iod->sgt.orig_nents = blk_rq_map_sg(req->q, req, iod->sgt.sgl);
> + iod->sgt.orig_nents = blk_rq_map_sg(req, iod->sgt.sgl);
> if (!iod->sgt.orig_nents)
> goto out_free_sg;
>
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 86a2891d9bcc..b5a0295b5bf4 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -1476,8 +1476,7 @@ static int nvme_rdma_dma_map_req(struct ib_device *ibdev, struct request *rq,
> if (ret)
> return -ENOMEM;
>
> - req->data_sgl.nents = blk_rq_map_sg(rq->q, rq,
> - req->data_sgl.sg_table.sgl);
> + req->data_sgl.nents = blk_rq_map_sg(rq, req->data_sgl.sg_table.sgl);
>
> *count = ib_dma_map_sg(ibdev, req->data_sgl.sg_table.sgl,
> req->data_sgl.nents, rq_dma_dir(rq));
> diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
> index a9d112d34d4f..a5c41144667c 100644
> --- a/drivers/nvme/target/loop.c
> +++ b/drivers/nvme/target/loop.c
> @@ -162,7 +162,7 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,
> }
>
> iod->req.sg = iod->sg_table.sgl;
> - iod->req.sg_cnt = blk_rq_map_sg(req->q, req, iod->sg_table.sgl);
> + iod->req.sg_cnt = blk_rq_map_sg(req, iod->sg_table.sgl);
> iod->req.transfer_len = blk_rq_payload_bytes(req);
> }
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index f1cfe0bb89b2..0d29470e86b0 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -1149,7 +1149,7 @@ blk_status_t scsi_alloc_sgtables(struct scsi_cmnd *cmd)
> * Next, walk the list, and fill in the addresses and sizes of
> * each segment.
> */
> - count = __blk_rq_map_sg(rq->q, rq, cmd->sdb.table.sgl, &last_sg);
> + count = __blk_rq_map_sg(rq, cmd->sdb.table.sgl, &last_sg);
>
> if (blk_rq_bytes(rq) & rq->q->limits.dma_pad_mask) {
> unsigned int pad_len =
> diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
> index fa2a76cc2f73..f2eff998913d 100644
> --- a/include/linux/blk-mq.h
> +++ b/include/linux/blk-mq.h
> @@ -1165,14 +1165,13 @@ static inline unsigned short blk_rq_nr_discard_segments(struct request *rq)
> return max_t(unsigned short, rq->nr_phys_segments, 1);
> }
>
> -int __blk_rq_map_sg(struct request_queue *q, struct request *rq,
> - struct scatterlist *sglist, struct scatterlist **last_sg);
> -static inline int blk_rq_map_sg(struct request_queue *q, struct request *rq,
> - struct scatterlist *sglist)
> +int __blk_rq_map_sg(struct request *rq, struct scatterlist *sglist,
> + struct scatterlist **last_sg);
> +static inline int blk_rq_map_sg(struct request *rq, struct scatterlist *sglist)
> {
> struct scatterlist *last_sg = NULL;
>
> - return __blk_rq_map_sg(q, rq, sglist, &last_sg);
> + return __blk_rq_map_sg(rq, sglist, &last_sg);
> }
> void blk_dump_rq_flags(struct request *, char *);
>
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] block: remove unused parameter
2025-03-13 3:53 ` [PATCH] block: remove unused parameter Anuj Gupta
` (2 preceding siblings ...)
2025-03-13 12:17 ` Jinpu Wang
@ 2025-03-13 13:24 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Jens Axboe @ 2025-03-13 13:24 UTC (permalink / raw)
To: Md. Haris Iqbal, Jack Wang, Michael S. Tsirkin, Jason Wang,
Xuan Zhuo, Eugenio Pérez, Paolo Bonzini, Stefan Hajnoczi,
Roger Pau Monné, Juergen Gross, Stefano Stabellini,
Oleksandr Tyshchenko, Maxim Levitsky, Alex Dubov, Ulf Hansson,
Richard Weinberger, Zhihao Cheng, Miquel Raynal,
Vignesh Raghavendra, Sven Peter, Janne Grunau, Alyssa Rosenzweig,
Keith Busch, Christoph Hellwig, Sagi Grimberg, James Smart,
Chaitanya Kulkarni, James E.J. Bottomley, Martin K. Petersen,
Anuj Gupta
Cc: linux-block, linux-kernel, virtualization, xen-devel, linux-mmc,
linux-mtd, asahi, linux-arm-kernel, linux-nvme, linux-scsi
On Thu, 13 Mar 2025 09:23:18 +0530, Anuj Gupta wrote:
> request_queue param is not used by blk_rq_map_sg and __blk_rq_map_sg.
> remove it.
>
>
Applied, thanks!
[1/1] block: remove unused parameter
commit: 61667cb6644f6fb01eb8baa928e381c016b5ed7b
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread