|
@@ -1121,7 +1121,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
|
|
ns->queue = blk_mq_init_queue(ctrl->tagset);
|
|
ns->queue = blk_mq_init_queue(ctrl->tagset);
|
|
if (IS_ERR(ns->queue))
|
|
if (IS_ERR(ns->queue))
|
|
goto out_free_ns;
|
|
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_NONROT, ns->queue);
|
|
ns->queue->queuedata = ns;
|
|
ns->queue->queuedata = ns;
|
|
ns->ctrl = ctrl;
|
|
ns->ctrl = ctrl;
|