diff options
| author | Keith Busch <keith.busch@intel.com> | 2016-02-11 21:05:40 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-02-11 21:14:03 +0100 |
| commit | ef2d4615c59efb312e531a5e949970f37ca1c841 (patch) | |
| tree | 06e439e635c71d8c2681d313d8ba05d7b2488ecf /drivers/nvme | |
| parent | NVMe: Fix io incapable return values (diff) | |
| download | linux-ef2d4615c59efb312e531a5e949970f37ca1c841.tar.xz linux-ef2d4615c59efb312e531a5e949970f37ca1c841.zip | |
NVMe: Allow request merges
It is generally more efficient to submit larger IO.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c5bf001af559..3cd921e6121e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1121,7 +1121,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) ns->queue = blk_mq_init_queue(ctrl->tagset); if (IS_ERR(ns->queue)) goto out_free_ns; - queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, ns->queue); queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue); ns->queue->queuedata = ns; ns->ctrl = ctrl; |