blk-mq: rename blk_mq_end_io to blk_mq_end_request
authorChristoph Hellwig <hch@lst.de>
Sat, 13 Sep 2014 23:40:10 +0000 (16:40 -0700)
committerJens Axboe <axboe@fb.com>
Mon, 22 Sep 2014 18:00:07 +0000 (12:00 -0600)
Now that we've changed the driver API on the submission side use the
opportunity to fix up the name on the completion side to fit into the
general scheme.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-flush.c
block/blk-mq.c
drivers/block/mtip32xx/mtip32xx.c
drivers/block/null_blk.c
drivers/block/virtio_blk.c
drivers/scsi/scsi_lib.c
include/linux/blk-mq.h

index 3cb5e9e7108adc8473296d8fe762bb16338d17f4..698e6926388c791e776c83009a5f26296f40e205 100644 (file)
@@ -202,7 +202,7 @@ static bool blk_flush_complete_seq(struct request *rq, unsigned int seq,
                list_del_init(&rq->flush.list);
                blk_flush_restore_request(rq);
                if (q->mq_ops)
-                       blk_mq_end_io(rq, error);
+                       blk_mq_end_request(rq, error);
                else
                        __blk_end_request_all(rq, error);
                break;
@@ -378,7 +378,7 @@ void blk_insert_flush(struct request *rq)
         */
        if (!policy) {
                if (q->mq_ops)
-                       blk_mq_end_io(rq, 0);
+                       blk_mq_end_request(rq, 0);
                else
                        __blk_end_bidi_request(rq, 0, 0, 0);
                return;
index 141f2e06803a249b9ad3ec53f4e8eff7890c5089..1713686f5c2f1a1b6aee6d01acfa18f718ae51d3 100644 (file)
@@ -300,7 +300,7 @@ void blk_mq_clone_flush_request(struct request *flush_rq,
                hctx->cmd_size);
 }
 
-inline void __blk_mq_end_io(struct request *rq, int error)
+inline void __blk_mq_end_request(struct request *rq, int error)
 {
        blk_account_io_done(rq);
 
@@ -312,15 +312,15 @@ inline void __blk_mq_end_io(struct request *rq, int error)
                blk_mq_free_request(rq);
        }
 }
-EXPORT_SYMBOL(__blk_mq_end_io);
+EXPORT_SYMBOL(__blk_mq_end_request);
 
-void blk_mq_end_io(struct request *rq, int error)
+void blk_mq_end_request(struct request *rq, int error)
 {
        if (blk_update_request(rq, error, blk_rq_bytes(rq)))
                BUG();
-       __blk_mq_end_io(rq, error);
+       __blk_mq_end_request(rq, error);
 }
-EXPORT_SYMBOL(blk_mq_end_io);
+EXPORT_SYMBOL(blk_mq_end_request);
 
 static void __blk_mq_complete_request_remote(void *data)
 {
@@ -360,7 +360,7 @@ void __blk_mq_complete_request(struct request *rq)
        struct request_queue *q = rq->q;
 
        if (!q->softirq_done_fn)
-               blk_mq_end_io(rq, rq->errors);
+               blk_mq_end_request(rq, rq->errors);
        else
                blk_mq_ipi_complete_request(rq);
 }
@@ -758,7 +758,7 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)
                        pr_err("blk-mq: bad return on queue: %d\n", ret);
                case BLK_MQ_RQ_QUEUE_ERROR:
                        rq->errors = -EIO;
-                       blk_mq_end_io(rq, rq->errors);
+                       blk_mq_end_request(rq, rq->errors);
                        break;
                }
 
@@ -1200,7 +1200,7 @@ static void blk_mq_make_request(struct request_queue *q, struct bio *bio)
 
                        if (ret == BLK_MQ_RQ_QUEUE_ERROR) {
                                rq->errors = -EIO;
-                               blk_mq_end_io(rq, rq->errors);
+                               blk_mq_end_request(rq, rq->errors);
                                goto done;
                        }
                }
index 4042440a0470df298c2de3d075c6a5b561385e24..6b7e8d0fba99a8296980c2e3c981963508f1610b 100644 (file)
@@ -247,7 +247,7 @@ static void mtip_async_complete(struct mtip_port *port,
        if (unlikely(cmd->unaligned))
                up(&port->cmd_slot_unal);
 
-       blk_mq_end_io(rq, status ? -EIO : 0);
+       blk_mq_end_request(rq, status ? -EIO : 0);
 }
 
 /*
@@ -3739,7 +3739,7 @@ static int mtip_submit_request(struct blk_mq_hw_ctx *hctx, struct request *rq)
                int err;
 
                err = mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq));
-               blk_mq_end_io(rq, err);
+               blk_mq_end_request(rq, err);
                return 0;
        }
 
index 332ce20d45da1c2753d965dae379f951322cfc33..ac50a2931044e44c13ce03d7a8e0278734ce49d0 100644 (file)
@@ -177,7 +177,7 @@ static void end_cmd(struct nullb_cmd *cmd)
 {
        switch (queue_mode)  {
        case NULL_Q_MQ:
-               blk_mq_end_io(cmd->rq, 0);
+               blk_mq_end_request(cmd->rq, 0);
                return;
        case NULL_Q_RQ:
                INIT_LIST_HEAD(&cmd->rq->queuelist);
index 83816bf6882f7d279b3eabbf47992f5781143003..f751fc392ba97d7366a961bc79628976cf7747c2 100644 (file)
@@ -135,7 +135,7 @@ static inline void virtblk_request_done(struct request *req)
                req->errors = (error != 0);
        }
 
-       blk_mq_end_io(req, error);
+       blk_mq_end_request(req, error);
 }
 
 static void virtblk_done(struct virtqueue *vq)
index 2dcd9078de48921d62542412789eeb279a5a36ea..73ce7d27f5c81b5b0334a0e7671bc35c41f0a701 100644 (file)
@@ -713,7 +713,7 @@ static bool scsi_end_request(struct request *req, int error,
 
        if (req->mq_ctx) {
                /*
-                * In the MQ case the command gets freed by __blk_mq_end_io,
+                * In the MQ case the command gets freed by __blk_mq_end_request,
                 * so we have to do all cleanup that depends on it earlier.
                 *
                 * We also can't kick the queues from irq context, so we
@@ -721,7 +721,7 @@ static bool scsi_end_request(struct request *req, int error,
                 */
                scsi_mq_uninit_cmd(cmd);
 
-               __blk_mq_end_io(req, error);
+               __blk_mq_end_request(req, error);
 
                if (scsi_target(sdev)->single_lun ||
                    !list_empty(&sdev->host->starved_list))
index 878b6f71da4804c6173b4e8fd0d9d249ae355608..cb217c16990dcb5859c7d7a335a53794e9be4eea 100644 (file)
@@ -160,8 +160,8 @@ struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_ind
 struct blk_mq_hw_ctx *blk_mq_alloc_single_hw_queue(struct blk_mq_tag_set *, unsigned int, int);
 
 void blk_mq_start_request(struct request *rq);
-void blk_mq_end_io(struct request *rq, int error);
-void __blk_mq_end_io(struct request *rq, int error);
+void blk_mq_end_request(struct request *rq, int error);
+void __blk_mq_end_request(struct request *rq, int error);
 
 void blk_mq_requeue_request(struct request *rq);
 void blk_mq_add_to_requeue_list(struct request *rq, bool at_head);