Commit c55a2fd4 authored by Ming Lin's avatar Ming Lin Committed by Jens Axboe
Browse files

nvme: move nvme_cancel_request() to common code 



So it can be used by fabrics driver also.

Signed-off-by: default avatarMing Lin <ming.l@samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarKeith Busch <keith.bsuch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e1958e65

drivers/nvme/host/core.c

+17 −0
Original line number Diff line number Diff line
@@ -58,6 +58,23 @@ static DEFINE_SPINLOCK(dev_list_lock); 


static struct class *nvme_class;



void nvme_cancel_request(struct request *req, void *data, bool reserved)

{

	int status;



	if (!blk_mq_request_started(req))

		return;



	dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,

				"Cancelling I/O %d", req->tag);



	status = NVME_SC_ABORT_REQ;

	if (blk_queue_dying(req->q))

		status |= NVME_SC_DNR;

	blk_mq_complete_request(req, status);

}

EXPORT_SYMBOL_GPL(nvme_cancel_request);



bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,

		enum nvme_ctrl_state new_state)

{

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static inline bool nvme_req_needs_retry(struct request *req, u16 status) 
		(jiffies - req->start_time) < req->timeout;

}



void nvme_cancel_request(struct request *req, void *data, bool reserved);

bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,

		enum nvme_ctrl_state new_state);

int nvme_disable_ctrl(struct nvme_ctrl *ctrl, u64 cap);

drivers/nvme/host/pci.c

+0 −16
Original line number Diff line number Diff line
@@ -919,22 +919,6 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 
	return BLK_EH_RESET_TIMER;

}



static void nvme_cancel_request(struct request *req, void *data, bool reserved)

{

	int status;



	if (!blk_mq_request_started(req))

		return;



	dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,

				"Cancelling I/O %d", req->tag);



	status = NVME_SC_ABORT_REQ;

	if (blk_queue_dying(req->q))

		status |= NVME_SC_DNR;

	blk_mq_complete_request(req, status);

}



static void nvme_free_queue(struct nvme_queue *nvmeq)

{

	dma_free_coherent(nvmeq->q_dmadev, CQ_SIZE(nvmeq->q_depth),

CRA Git | Maintained and supported by SUSTech CRA and CCSE