NVMe: End sync requests immediately on failure

Do not retry failed sync commands so the original status may be seen
without issuing unnecessary retries.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
  Orabug: 24561038
  Mainline Commit: 75619bfa904d0f2840b4274eb92ce47b2e1c472e

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index b3e0a2a57c598eab06b344b64d532a2aaab53aff..e0c325dace5db92026b0720d2523bd2c142c6abc 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1041,7 +1041,8 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
        if (IS_ERR(req))
                return PTR_ERR(req);
 
-       req->cmd_type = REQ_TYPE_SPECIAL; 
+       req->cmd_type = REQ_TYPE_SPECIAL;
+       req->cmd_flags = REQ_FAILFAST_DRIVER;
        req->__data_len = 0;
        req->__sector = (sector_t) -1;
        req->bio = req->biotail = NULL;