NVMe: Set queue flags correctly

QUEUE_FLAG_* are flags (other than QUEUE_FLAG_DEFAULT), so they cannot
be ORed together.  Set the queue flags using queue_flag_set_unlocked().

Reported-by: Donald Wood <donald.e.wood@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 3cf82c27a544..b583603fae5b 100644
--- a/drivers/block/nvme.c
+++ b/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;