mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 04:12:04 -04:00
Merge branch 'nvme-4.14' of git://git.infradead.org/nvme into for-linus
Pull an NVMe fix from Christoph.
This commit is contained in:
commit
93689a6031
1 changed files with 7 additions and 4 deletions
|
|
@ -1614,12 +1614,15 @@ nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue, struct request *rq)
|
|||
/*
|
||||
* reconnecting state means transport disruption, which
|
||||
* can take a long time and even might fail permanently,
|
||||
* so we can't let incoming I/O be requeued forever.
|
||||
* fail it fast to allow upper layers a chance to
|
||||
* failover.
|
||||
* fail fast to give upper layers a chance to failover.
|
||||
* deleting state means that the ctrl will never accept
|
||||
* commands again, fail it permanently.
|
||||
*/
|
||||
if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING)
|
||||
if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING ||
|
||||
queue->ctrl->ctrl.state == NVME_CTRL_DELETING) {
|
||||
nvme_req(rq)->status = NVME_SC_ABORT_REQ;
|
||||
return BLK_STS_IOERR;
|
||||
}
|
||||
return BLK_STS_RESOURCE; /* try again later */
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue