From: Ashok Vairavan <ashok.vairavan@oracle.com>
Date: Fri, 26 Aug 2016 17:22:26 +0000 (-0700)
Subject: nvme: don't overwrite req->cmd_flags on sync cmd
X-Git-Tag: v4.1.12-92~82^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d7c23166ce62a3d817fb494dfa3ab902c3129dde;p=users%2Fjedix%2Flinux-maple.git

nvme: don't overwrite req->cmd_flags on sync cmd

In __nvme_submit_sync_cmd, the request direction is overwritten when
the REQ_FAILFAST_DRIVER flag is set.

Signed-off-by: Matias Bjørling <m@bjorling.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Fixes: 75619bfa904d0 ("NVMe: End sync requests immediately on failure")
Signed-off-by: Jens Axboe <axboe@fb.com>

  Orabug: 24561038
  Mainline Commit: e112af0dc9f55099b948e55077504a44b4162c79

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 e0c325dace5d..f25b81a28510 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1042,7 +1042,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
 		return PTR_ERR(req);
 
 	req->cmd_type = REQ_TYPE_SPECIAL;
-	req->cmd_flags = REQ_FAILFAST_DRIVER;
+	req->cmd_flags |= REQ_FAILFAST_DRIVER;
 	req->__data_len = 0;
 	req->__sector = (sector_t) -1;
 	req->bio = req->biotail = NULL;