block: remove the q argument from blk_rq_map_kern

Remove the q argument from blk_rq_map_kern and the internal helpers
called by it as the queue can trivially be derived from the request.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>

diff --git a/block/blk-map.c b/block/blk-map.c
index d2f22744b3d11903f4a8dd438815e3a5b5d4332e..0cbceb2671c90450b425d9fc2cc49c0da5272df0 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -319,7 +319,6 @@ static void bio_map_kern_endio(struct bio *bio)
 
 /**
  *     bio_map_kern    -       map kernel address into bio
- *     @q: the struct request_queue for the bio
  *     @data: pointer to buffer to map
  *     @len: length in bytes
  *     @gfp_mask: allocation flags for bio allocation
@@ -327,8 +326,7 @@ static void bio_map_kern_endio(struct bio *bio)
  *     Map the kernel address into a bio suitable for io to a block
  *     device. Returns an error pointer in case of error.
  */
-static struct bio *bio_map_kern(struct request_queue *q, void *data,
-               unsigned int len, gfp_t gfp_mask)
+static struct bio *bio_map_kern(void *data, unsigned int len, gfp_t gfp_mask)
 {
        unsigned long kaddr = (unsigned long)data;
        unsigned long end = (kaddr + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
@@ -402,7 +400,6 @@ static void bio_copy_kern_endio_read(struct bio *bio)
 
 /**
  *     bio_copy_kern   -       copy kernel address into bio
- *     @q: the struct request_queue for the bio
  *     @data: pointer to buffer to copy
  *     @len: length in bytes
  *     @gfp_mask: allocation flags for bio and page allocation
@@ -411,8 +408,8 @@ static void bio_copy_kern_endio_read(struct bio *bio)
  *     copy the kernel address into a bio suitable for io to a block
  *     device. Returns an error pointer in case of error.
  */
-static struct bio *bio_copy_kern(struct request_queue *q, void *data,
-               unsigned int len, gfp_t gfp_mask, int reading)
+static struct bio *bio_copy_kern(void *data, unsigned int len, gfp_t gfp_mask,
+               int reading)
 {
        unsigned long kaddr = (unsigned long)data;
        unsigned long end = (kaddr + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
@@ -689,7 +686,6 @@ EXPORT_SYMBOL(blk_rq_unmap_user);
 
 /**
  * blk_rq_map_kern - map kernel data to a request, for passthrough requests
- * @q:         request queue where request should be inserted
  * @rq:                request to fill
  * @kbuf:      the kernel buffer
  * @len:       length of user data
@@ -700,24 +696,24 @@ EXPORT_SYMBOL(blk_rq_unmap_user);
  *    buffer is used. Can be called multiple times to append multiple
  *    buffers.
  */
-int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
-                   unsigned int len, gfp_t gfp_mask)
+int blk_rq_map_kern(struct request *rq, void *kbuf, unsigned int len,
+               gfp_t gfp_mask)
 {
        int reading = rq_data_dir(rq) == READ;
        unsigned long addr = (unsigned long) kbuf;
        struct bio *bio;
        int ret;
 
-       if (len > (queue_max_hw_sectors(q) << 9))
+       if (len > (queue_max_hw_sectors(rq->q) << SECTOR_SHIFT))
                return -EINVAL;
        if (!len || !kbuf)
                return -EINVAL;
 
-       if (!blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf) ||
-           blk_queue_may_bounce(q))
-               bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
+       if (!blk_rq_aligned(rq->q, addr, len) || object_is_on_stack(kbuf) ||
+           blk_queue_may_bounce(rq->q))
+               bio = bio_copy_kern(kbuf, len, gfp_mask, reading);
        else
-               bio = bio_map_kern(q, kbuf, len, gfp_mask);
+               bio = bio_map_kern(kbuf, len, gfp_mask);
 
        if (IS_ERR(bio))
                return PTR_ERR(bio);

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 65b96c083b3cad28aa73868fda222a7c16d15dc6..d5cc7bd2875c8429a34a954e3ed054e78d87a16a 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -725,7 +725,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
        scmd = blk_mq_rq_to_pdu(rq);
 
        if (cgc->buflen) {
-               ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,
+               ret = blk_rq_map_kern(rq, cgc->buffer, cgc->buflen,
                                      GFP_NOIO);
                if (ret)
                        goto out;

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index a183aa7648c36ddb385ddcbc8cb70ce3f5209523..c40ac1287904c368e8f8a34e396fdb7cf5ceca85 100644 (file)
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -363,8 +363,7 @@ static int ublk_report_zones(struct gendisk *disk, sector_t sector,
                if (ret)
                        goto free_req;
 
-               ret = blk_rq_map_kern(disk->queue, req, buffer, buffer_length,
-                                       GFP_KERNEL);
+               ret = blk_rq_map_kern(req, buffer, buffer_length, GFP_KERNEL);
                if (ret)
                        goto erase_desc;
 

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 7cffea01d868c6dcfe6734d3c89c1709fec07956..30bca8cb7106040d3bbb11ba9e0b546510534324 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -571,7 +571,7 @@ static int virtblk_submit_zone_report(struct virtio_blk *vblk,
        vbr->out_hdr.type = cpu_to_virtio32(vblk->vdev, VIRTIO_BLK_T_ZONE_REPORT);
        vbr->out_hdr.sector = cpu_to_virtio64(vblk->vdev, sector);
 
-       err = blk_rq_map_kern(q, req, report_buf, report_len, GFP_KERNEL);
+       err = blk_rq_map_kern(req, report_buf, report_len, GFP_KERNEL);
        if (err)
                goto out;
 
@@ -817,7 +817,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str)
        vbr->out_hdr.type = cpu_to_virtio32(vblk->vdev, VIRTIO_BLK_T_GET_ID);
        vbr->out_hdr.sector = 0;
 
-       err = blk_rq_map_kern(q, req, id_str, VIRTIO_BLK_ID_BYTES, GFP_KERNEL);
+       err = blk_rq_map_kern(req, id_str, VIRTIO_BLK_ID_BYTES, GFP_KERNEL);
        if (err)
                goto out;
 

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index eb6ea8acb3cca7421d7fb218e51d855f2c056825..34d2abdb2f89b72537570b682caade5d0691fc6c 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1157,7 +1157,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
                req->cmd_flags &= ~REQ_FAILFAST_DRIVER;
 
        if (buffer && bufflen) {
-               ret = blk_rq_map_kern(q, req, buffer, bufflen, GFP_KERNEL);
+               ret = blk_rq_map_kern(req, buffer, bufflen, GFP_KERNEL);
                if (ret)
                        goto out;
        }

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 2fa45556e1eae008a953a7397509fcb5501423be..0ddc95bafc71f76aee9c211842faea0f2eed16cc 100644 (file)
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -601,7 +601,7 @@ static int sg_scsi_ioctl(struct request_queue *q, bool open_for_write,
        }
 
        if (bytes) {
-               err = blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO);
+               err = blk_rq_map_kern(rq, buffer, bytes, GFP_NOIO);
                if (err)
                        goto error;
        }

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0d29470e86b0b8ee96dffd541f3090d41d457e48..f313fcd30269b3b761b39b683bdd79a682a3e29a 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -313,8 +313,7 @@ retry:
                return PTR_ERR(req);
 
        if (bufflen) {
-               ret = blk_rq_map_kern(sdev->request_queue, req,
-                                     buffer, bufflen, GFP_NOIO);
+               ret = blk_rq_map_kern(req, buffer, bufflen, GFP_NOIO);
                if (ret)
                        goto out;
        }

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 8eb9b3310167c36f8a67ee8756a97d1274f8e73b..8901347c778b4d26829c2c24660a486cc3963119 100644 (file)
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -1031,8 +1031,8 @@ int blk_rq_map_user_io(struct request *, struct rq_map_data *,
 int blk_rq_map_user_iov(struct request_queue *, struct request *,
                struct rq_map_data *, const struct iov_iter *, gfp_t);
 int blk_rq_unmap_user(struct bio *);
-int blk_rq_map_kern(struct request_queue *, struct request *, void *,
-               unsigned int, gfp_t);
+int blk_rq_map_kern(struct request *rq, void *kbuf, unsigned int len,
+               gfp_t gfp);
 int blk_rq_append_bio(struct request *rq, struct bio *bio);
 void blk_execute_rq_nowait(struct request *rq, bool at_head);
 blk_status_t blk_execute_rq(struct request *rq, bool at_head);