From bf6a75b44e28f352b87f19c30063f4a108bd8fdb Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Tue, 10 Jan 2012 14:35:08 -0700 Subject: [PATCH] --- yaml --- r: 286321 b: refs/heads/master c: 4eeb9215a0d5c9494ca8b20158cc8ee82618840c h: refs/heads/master i: 286319: 23123be6d4e7a8ca39a165e8dff85aa064db3b2c v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 241e9362e14a..aa03d76e657f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c2ad9faaf662b4a525348775deca3ac8e6c35a0 +refs/heads/master: 4eeb9215a0d5c9494ca8b20158cc8ee82618840c diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index 3cf82c27a544..b583603fae5b 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/drivers/block/nvme.c @@ -1315,8 +1315,10 @@ static struct nvme_ns *nvme_alloc_ns(struct nvme_dev *dev, int nsid, ns->queue = blk_alloc_queue(GFP_KERNEL); if (!ns->queue) goto out_free_ns; - ns->queue->queue_flags = QUEUE_FLAG_DEFAULT | QUEUE_FLAG_NOMERGES | - QUEUE_FLAG_NONROT | QUEUE_FLAG_DISCARD; + ns->queue->queue_flags = QUEUE_FLAG_DEFAULT; + queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, ns->queue); + queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue); +/* queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, ns->queue); */ blk_queue_make_request(ns->queue, nvme_make_request); ns->dev = dev; ns->queue->queuedata = ns;