diff options
| author | Jens Axboe <axboe@fb.com> | 2016-04-12 15:43:09 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-17 20:16:44 -0500 |
| commit | a614eb70932a9e52395dcc12f1e09d60a236db2b (patch) | |
| tree | 5f8cbbc97b01c544c24fa7d2a8ed6ba295853b4c | |
| parent | ee1cf78fa4ab1057cf5b9b672a4deb4cd65e2d67 (diff) | |
NVMe: switch to using blk_queue_write_cache()
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/nvme/host/core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 643f457131c2..c4f9feb0cd51 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -894,6 +894,8 @@ EXPORT_SYMBOL_GPL(nvme_shutdown_ctrl); static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, struct request_queue *q) { + bool vwc = false; + if (ctrl->max_hw_sectors) { u32 max_segments = (ctrl->max_hw_sectors / (ctrl->page_size >> 9)) + 1; @@ -903,9 +905,10 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, } if (ctrl->stripe_size) blk_queue_chunk_sectors(q, ctrl->stripe_size >> 9); - if (ctrl->vwc & NVME_CTRL_VWC_PRESENT) - blk_queue_flush(q, REQ_FLUSH | REQ_FUA); blk_queue_virt_boundary(q, ctrl->page_size - 1); + if (ctrl->vwc & NVME_CTRL_VWC_PRESENT) + vwc = true; + blk_queue_write_cache(q, vwc, vwc); } /* |