Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8a446ad authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e2490073

block/blk-flush.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

block/blk-mq.c

+8 −8
Original line number Diff line number Diff line
@@ -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;

			}

		}

drivers/block/mtip32xx/mtip32xx.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/block/null_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/virtio_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -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)