diff options
| author |   Matias Bjørling <m@bjorling.me> | 2015-06-05 14:54:24 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2015-06-17 09:36:57 -0600 |
| commit | e112af0dc9f55099b948e55077504a44b4162c79 (patch) | |
| tree | 77a0b706aca0138cc6c26381fa63da768b0b3a67 /drivers/block/nvme-core.c | |
| parent | mtip32xx: increase wait time for hba reset (diff) | |
| download | linux-dev-e112af0dc9f55099b948e55077504a44b4162c79.tar.xz linux-dev-e112af0dc9f55099b948e55077504a44b4162c79.zip | |
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>
Diffstat (limited to 'drivers/block/nvme-core.c')
| -rw-r--r-- | drivers/block/nvme-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 2072ae81c13a..12d5b7b03f9b 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1010,7 +1010,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, return PTR_ERR(req); req->cmd_type = REQ_TYPE_DRV_PRIV; - 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; |