xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme-rdma: fix merge error

Browse Source 
The merge of 4.12-rc5 into the for-4.13/block tree didn't handle the queue
ready case correctly.  Fix this by propagating blk_status_t into
nvme_rdma_queue_is_ready.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig
2017-06-12 18:26:06 +02:00
committed by Jens Axboe
parent 8f66439eec
commit a104c9f22c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/nvme/host/rdma.c
View File

@@ -1435,8 +1435,8 @@ nvme_rdma_timeout(struct request *rq, bool reserved)
/* /*
* We cannot accept any other command until the Connect command has completed. * We cannot accept any other command until the Connect command has completed.
*/ */
static inline int nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue, static inline blk_status_t
struct request *rq) nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue, struct request *rq)
{ {
if (unlikely(!test_bit(NVME_RDMA_Q_LIVE, &queue->flags))) { if (unlikely(!test_bit(NVME_RDMA_Q_LIVE, &queue->flags))) {
struct nvme_command *cmd = nvme_req(rq)->cmd; struct nvme_command *cmd = nvme_req(rq)->cmd;
@@ -1452,9 +1452,8 @@ static inline int nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue,
* failover. * failover.
*/ */
if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING) if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING)
return -EIO; return BLK_STS_IOERR;
else return BLK_STS_RESOURCE; /* try again later */
return -EAGAIN;
} }
} }
@@ -1479,7 +1478,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
ret = nvme_rdma_queue_is_ready(queue, rq); ret = nvme_rdma_queue_is_ready(queue, rq);
if (unlikely(ret)) if (unlikely(ret))
goto err; return ret;
dev = queue->device->dev; dev = queue->device->dev;
ib_dma_sync_single_for_cpu(dev, sqe->dma, ib_dma_sync_single_for_cpu(dev, sqe->dma,