diff options
| author |   Jens Axboe <axboe@fb.com> | 2016-04-12 15:43:09 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-12 16:00:39 -0600 |
| commit | 7c88cb00f2a26637bade6c62a17d17f31a954e30 (patch) | |
| tree | 70aded23eab5c166dada0487bae59d426da87f80 /drivers/nvme | |
| parent | sd: switch to using blk_queue_write_cache() (diff) | |
| download | linux-dev-7c88cb00f2a26637bade6c62a17d17f31a954e30.tar.xz linux-dev-7c88cb00f2a26637bade6c62a17d17f31a954e30.zip | |
NVMe: switch to using blk_queue_write_cache()
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -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 6631f38aebca..4eb575933587 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -999,6 +999,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; @@ -1008,9 +1010,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); } /* |