aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-03-30 16:39:16 -0400
committerJens Axboe <axboe@fb.com>2017-03-31 10:28:58 -0400
commitf363b089be0a39fe4282c688118a51d21f952bc7 (patch)
tree67ef76e6c2f43898be5f8ff9caaf692132236f86
parentdb5bcf87bb9e856e90c131d6e636a5550c2bbcd3 (diff)
blk-mq: constify struct blk_mq_ops
Constify all instances of blk_mq_ops, as they are never modified. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/block/loop.c2
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c2
-rw-r--r--drivers/block/nbd.c2
-rw-r--r--drivers/block/null_blk.c2
-rw-r--r--drivers/block/rbd.c2
-rw-r--r--drivers/block/virtio_blk.c2
-rw-r--r--drivers/block/xen-blkfront.c2
-rw-r--r--drivers/md/dm-rq.c2
-rw-r--r--drivers/mtd/ubi/block.c2
-rw-r--r--drivers/nvme/host/fc.c4
-rw-r--r--drivers/nvme/host/pci.c4
-rw-r--r--drivers/nvme/host/rdma.c4
-rw-r--r--drivers/nvme/target/loop.c4
-rw-r--r--drivers/scsi/scsi_lib.c2
14 files changed, 18 insertions, 18 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 0ecb6461ed81..cc981f34e017 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1710,7 +1710,7 @@ static int loop_init_request(void *data, struct request *rq,
1710 return 0; 1710 return 0;
1711} 1711}
1712 1712
1713static struct blk_mq_ops loop_mq_ops = { 1713static const struct blk_mq_ops loop_mq_ops = {
1714 .queue_rq = loop_queue_rq, 1714 .queue_rq = loop_queue_rq,
1715 .init_request = loop_init_request, 1715 .init_request = loop_init_request,
1716}; 1716};
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index c96c35ab39df..30076e7753bc 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3889,7 +3889,7 @@ exit_handler:
3889 return BLK_EH_RESET_TIMER; 3889 return BLK_EH_RESET_TIMER;
3890} 3890}
3891 3891
3892static struct blk_mq_ops mtip_mq_ops = { 3892static const struct blk_mq_ops mtip_mq_ops = {
3893 .queue_rq = mtip_queue_rq, 3893 .queue_rq = mtip_queue_rq,
3894 .init_request = mtip_init_cmd, 3894 .init_request = mtip_init_cmd,
3895 .exit_request = mtip_free_cmd, 3895 .exit_request = mtip_free_cmd,
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7e4287bc19e5..d3be8ea2f80d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -965,7 +965,7 @@ static int nbd_init_request(void *data, struct request *rq,
965 return 0; 965 return 0;
966} 966}
967 967
968static struct blk_mq_ops nbd_mq_ops = { 968static const struct blk_mq_ops nbd_mq_ops = {
969 .queue_rq = nbd_queue_rq, 969 .queue_rq = nbd_queue_rq,
970 .init_request = nbd_init_request, 970 .init_request = nbd_init_request,
971 .timeout = nbd_xmit_timeout, 971 .timeout = nbd_xmit_timeout,
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 444f8d88f1a8..f93906ff31e8 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -398,7 +398,7 @@ static int null_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
398 return 0; 398 return 0;
399} 399}
400 400
401static struct blk_mq_ops null_mq_ops = { 401static const struct blk_mq_ops null_mq_ops = {
402 .queue_rq = null_queue_rq, 402 .queue_rq = null_queue_rq,
403 .init_hctx = null_init_hctx, 403 .init_hctx = null_init_hctx,
404 .complete = null_softirq_done_fn, 404 .complete = null_softirq_done_fn,
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 517838b65964..f24ade333e0c 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4317,7 +4317,7 @@ static int rbd_init_request(void *data, struct request *rq,
4317 return 0; 4317 return 0;
4318} 4318}
4319 4319
4320static struct blk_mq_ops rbd_mq_ops = { 4320static const struct blk_mq_ops rbd_mq_ops = {
4321 .queue_rq = rbd_queue_rq, 4321 .queue_rq = rbd_queue_rq,
4322 .init_request = rbd_init_request, 4322 .init_request = rbd_init_request,
4323}; 4323};
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 1d4c9f8bc1e1..2d8290169271 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -597,7 +597,7 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
597 return blk_mq_virtio_map_queues(set, vblk->vdev, 0); 597 return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
598} 598}
599 599
600static struct blk_mq_ops virtio_mq_ops = { 600static const struct blk_mq_ops virtio_mq_ops = {
601 .queue_rq = virtio_queue_rq, 601 .queue_rq = virtio_queue_rq,
602 .complete = virtblk_request_done, 602 .complete = virtblk_request_done,
603 .init_request = virtblk_init_request, 603 .init_request = virtblk_init_request,
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 5067a0a952cb..d137ef8a72be 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -907,7 +907,7 @@ out_busy:
907 return BLK_MQ_RQ_QUEUE_BUSY; 907 return BLK_MQ_RQ_QUEUE_BUSY;
908} 908}
909 909
910static struct blk_mq_ops blkfront_mq_ops = { 910static const struct blk_mq_ops blkfront_mq_ops = {
911 .queue_rq = blkif_queue_rq, 911 .queue_rq = blkif_queue_rq,
912}; 912};
913 913
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index 28955b94d2b2..6886bf160fb2 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -761,7 +761,7 @@ static int dm_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
761 return BLK_MQ_RQ_QUEUE_OK; 761 return BLK_MQ_RQ_QUEUE_OK;
762} 762}
763 763
764static struct blk_mq_ops dm_mq_ops = { 764static const struct blk_mq_ops dm_mq_ops = {
765 .queue_rq = dm_mq_queue_rq, 765 .queue_rq = dm_mq_queue_rq,
766 .complete = dm_softirq_done, 766 .complete = dm_softirq_done,
767 .init_request = dm_mq_init_request, 767 .init_request = dm_mq_init_request,
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index c80869e60909..51f2be8889b5 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -347,7 +347,7 @@ static int ubiblock_init_request(void *data, struct request *req,
347 return 0; 347 return 0;
348} 348}
349 349
350static struct blk_mq_ops ubiblock_mq_ops = { 350static const struct blk_mq_ops ubiblock_mq_ops = {
351 .queue_rq = ubiblock_queue_rq, 351 .queue_rq = ubiblock_queue_rq,
352 .init_request = ubiblock_init_request, 352 .init_request = ubiblock_init_request,
353}; 353};
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 9690beb15e69..5939a0a4f7a5 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1948,7 +1948,7 @@ nvme_fc_complete_rq(struct request *rq)
1948 blk_mq_end_request(rq, error); 1948 blk_mq_end_request(rq, error);
1949} 1949}
1950 1950
1951static struct blk_mq_ops nvme_fc_mq_ops = { 1951static const struct blk_mq_ops nvme_fc_mq_ops = {
1952 .queue_rq = nvme_fc_queue_rq, 1952 .queue_rq = nvme_fc_queue_rq,
1953 .complete = nvme_fc_complete_rq, 1953 .complete = nvme_fc_complete_rq,
1954 .init_request = nvme_fc_init_request, 1954 .init_request = nvme_fc_init_request,
@@ -1959,7 +1959,7 @@ static struct blk_mq_ops nvme_fc_mq_ops = {
1959 .timeout = nvme_fc_timeout, 1959 .timeout = nvme_fc_timeout,
1960}; 1960};
1961 1961
1962static struct blk_mq_ops nvme_fc_admin_mq_ops = { 1962static const struct blk_mq_ops nvme_fc_admin_mq_ops = {
1963 .queue_rq = nvme_fc_queue_rq, 1963 .queue_rq = nvme_fc_queue_rq,
1964 .complete = nvme_fc_complete_rq, 1964 .complete = nvme_fc_complete_rq,
1965 .init_request = nvme_fc_init_admin_request, 1965 .init_request = nvme_fc_init_admin_request,
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 26a5fd05fe88..095b061416bf 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1129,7 +1129,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
1129 return result; 1129 return result;
1130} 1130}
1131 1131
1132static struct blk_mq_ops nvme_mq_admin_ops = { 1132static const struct blk_mq_ops nvme_mq_admin_ops = {
1133 .queue_rq = nvme_queue_rq, 1133 .queue_rq = nvme_queue_rq,
1134 .complete = nvme_complete_rq, 1134 .complete = nvme_complete_rq,
1135 .init_hctx = nvme_admin_init_hctx, 1135 .init_hctx = nvme_admin_init_hctx,
@@ -1138,7 +1138,7 @@ static struct blk_mq_ops nvme_mq_admin_ops = {
1138 .timeout = nvme_timeout, 1138 .timeout = nvme_timeout,
1139}; 1139};
1140 1140
1141static struct blk_mq_ops nvme_mq_ops = { 1141static const struct blk_mq_ops nvme_mq_ops = {
1142 .queue_rq = nvme_queue_rq, 1142 .queue_rq = nvme_queue_rq,
1143 .complete = nvme_complete_rq, 1143 .complete = nvme_complete_rq,
1144 .init_hctx = nvme_init_hctx, 1144 .init_hctx = nvme_init_hctx,
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 779f516e7a4e..3a677a43450f 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1517,7 +1517,7 @@ static void nvme_rdma_complete_rq(struct request *rq)
1517 blk_mq_end_request(rq, error); 1517 blk_mq_end_request(rq, error);
1518} 1518}
1519 1519
1520static struct blk_mq_ops nvme_rdma_mq_ops = { 1520static const struct blk_mq_ops nvme_rdma_mq_ops = {
1521 .queue_rq = nvme_rdma_queue_rq, 1521 .queue_rq = nvme_rdma_queue_rq,
1522 .complete = nvme_rdma_complete_rq, 1522 .complete = nvme_rdma_complete_rq,
1523 .init_request = nvme_rdma_init_request, 1523 .init_request = nvme_rdma_init_request,
@@ -1528,7 +1528,7 @@ static struct blk_mq_ops nvme_rdma_mq_ops = {
1528 .timeout = nvme_rdma_timeout, 1528 .timeout = nvme_rdma_timeout,
1529}; 1529};
1530 1530
1531static struct blk_mq_ops nvme_rdma_admin_mq_ops = { 1531static const struct blk_mq_ops nvme_rdma_admin_mq_ops = {
1532 .queue_rq = nvme_rdma_queue_rq, 1532 .queue_rq = nvme_rdma_queue_rq,
1533 .complete = nvme_rdma_complete_rq, 1533 .complete = nvme_rdma_complete_rq,
1534 .init_request = nvme_rdma_init_admin_request, 1534 .init_request = nvme_rdma_init_admin_request,
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index d1f06e7768ff..4bfb285c32e8 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -270,7 +270,7 @@ static int nvme_loop_init_admin_hctx(struct blk_mq_hw_ctx *hctx, void *data,
270 return 0; 270 return 0;
271} 271}
272 272
273static struct blk_mq_ops nvme_loop_mq_ops = { 273static const struct blk_mq_ops nvme_loop_mq_ops = {
274 .queue_rq = nvme_loop_queue_rq, 274 .queue_rq = nvme_loop_queue_rq,
275 .complete = nvme_loop_complete_rq, 275 .complete = nvme_loop_complete_rq,
276 .init_request = nvme_loop_init_request, 276 .init_request = nvme_loop_init_request,
@@ -278,7 +278,7 @@ static struct blk_mq_ops nvme_loop_mq_ops = {
278 .timeout = nvme_loop_timeout, 278 .timeout = nvme_loop_timeout,
279}; 279};
280 280
281static struct blk_mq_ops nvme_loop_admin_mq_ops = { 281static const struct blk_mq_ops nvme_loop_admin_mq_ops = {
282 .queue_rq = nvme_loop_queue_rq, 282 .queue_rq = nvme_loop_queue_rq,
283 .complete = nvme_loop_complete_rq, 283 .complete = nvme_loop_complete_rq,
284 .init_request = nvme_loop_init_admin_request, 284 .init_request = nvme_loop_init_admin_request,
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 19125d72f322..c1519660824b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2154,7 +2154,7 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)
2154 return q; 2154 return q;
2155} 2155}
2156 2156
2157static struct blk_mq_ops scsi_mq_ops = { 2157static const struct blk_mq_ops scsi_mq_ops = {
2158 .queue_rq = scsi_queue_rq, 2158 .queue_rq = scsi_queue_rq,
2159 .complete = scsi_softirq_done, 2159 .complete = scsi_softirq_done,
2160 .timeout = scsi_timeout, 2160 .timeout = scsi_timeout,