diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-06-04 08:43:00 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-07-27 19:12:05 +0200 |
| commit | 8decf5d5b9f3f72b802a017b0b035f7db0592acf (patch) | |
| tree | 84c8a9caa57ca9e13e3d81e68c5b12c092d62045 /drivers/nvme/host/core.c | |
| parent | 0e98719b0e4b48b61965e1d1cba037c2005d01d7 (diff) | |
| download | op-kernel-dev-8decf5d5b9f3f72b802a017b0b035f7db0592acf.zip op-kernel-dev-8decf5d5b9f3f72b802a017b0b035f7db0592acf.tar.gz | |
nvme: remove nvme_req_needs_failover
Now that we just call out to blk_path_error there isn't really any good
reason to not merge it into the only caller.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Diffstat (limited to 'drivers/nvme/host/core.c')
| -rw-r--r-- | drivers/nvme/host/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 4552167..456d37a 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -236,7 +236,8 @@ void nvme_complete_rq(struct request *req) trace_nvme_complete_rq(req); if (unlikely(status != BLK_STS_OK && nvme_req_needs_retry(req))) { - if (nvme_req_needs_failover(req, status)) { + if ((req->cmd_flags & REQ_NVME_MPATH) && + blk_path_error(status)) { nvme_failover_req(req); return; } |
