blk-mq: rename blk_mq_end_io to blk_mq_end_request

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>

2 files changed, 10 insertions, 10 deletions

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 3cb5e9e7108a..698e6926388c 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -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;
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 141f2e06803a..1713686f5c2f 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -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;
                         }
                 }