aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-09-13 19:40:10 -0400
committerJens Axboe <axboe@fb.com>2014-09-22 14:00:07 -0400
commitc8a446ad695ada43a885ec12b38411dbd190a11b (patch)
tree8d9569b272e633c24b613938d09a29ff16dd994b /drivers/block
parente2490073cd7c3d6f6ef6e029a208edd4d38efac4 (diff)
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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c4
-rw-r--r--drivers/block/null_blk.c2
-rw-r--r--drivers/block/virtio_blk.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 4042440a0470..6b7e8d0fba99 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -247,7 +247,7 @@ static void mtip_async_complete(struct mtip_port *port,
247 if (unlikely(cmd->unaligned)) 247 if (unlikely(cmd->unaligned))
248 up(&port->cmd_slot_unal); 248 up(&port->cmd_slot_unal);
249 249
250 blk_mq_end_io(rq, status ? -EIO : 0); 250 blk_mq_end_request(rq, status ? -EIO : 0);
251} 251}
252 252
253/* 253/*
@@ -3739,7 +3739,7 @@ static int mtip_submit_request(struct blk_mq_hw_ctx *hctx, struct request *rq)
3739 int err; 3739 int err;
3740 3740
3741 err = mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq)); 3741 err = mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq));
3742 blk_mq_end_io(rq, err); 3742 blk_mq_end_request(rq, err);
3743 return 0; 3743 return 0;
3744 } 3744 }
3745 3745
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 332ce20d45da..ac50a2931044 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -177,7 +177,7 @@ static void end_cmd(struct nullb_cmd *cmd)
177{ 177{
178 switch (queue_mode) { 178 switch (queue_mode) {
179 case NULL_Q_MQ: 179 case NULL_Q_MQ:
180 blk_mq_end_io(cmd->rq, 0); 180 blk_mq_end_request(cmd->rq, 0);
181 return; 181 return;
182 case NULL_Q_RQ: 182 case NULL_Q_RQ:
183 INIT_LIST_HEAD(&cmd->rq->queuelist); 183 INIT_LIST_HEAD(&cmd->rq->queuelist);
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 83816bf6882f..f751fc392ba9 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -135,7 +135,7 @@ static inline void virtblk_request_done(struct request *req)
135 req->errors = (error != 0); 135 req->errors = (error != 0);
136 } 136 }
137 137
138 blk_mq_end_io(req, error); 138 blk_mq_end_request(req, error);
139} 139}
140 140
141static void virtblk_done(struct virtqueue *vq) 141static void virtblk_done(struct virtqueue *vq)