Merge branch 'for-4.3/drivers' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / block / nvme-core.c

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 8de3de010741448ce036fbe2c0d7dbc0df2343f5..b97fc3fe0916a6b6fd3fb2be32be44ce3c137b39 100644 (file)
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2121,7 +2121,6 @@ static void nvme_alloc_ns(struct nvme_dev *dev, unsigned nsid)
                goto out_free_ns;
        queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, ns->queue);
        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue);
-       queue_flag_set_unlocked(QUEUE_FLAG_SG_GAPS, ns->queue);
        ns->dev = dev;
        ns->queue->queuedata = ns;
 
@@ -2144,6 +2143,7 @@ static void nvme_alloc_ns(struct nvme_dev *dev, unsigned nsid)
                blk_queue_chunk_sectors(ns->queue, dev->stripe_size >> 9);
        if (dev->vwc & NVME_CTRL_VWC_PRESENT)
                blk_queue_flush(ns->queue, REQ_FLUSH | REQ_FUA);
+       blk_queue_virt_boundary(ns->queue, dev->page_size - 1);
 
        disk->major = nvme_major;
        disk->first_minor = 0;