From: Christoph Hellwig <hch@lst.de>
Date: Thu, 2 Nov 2017 21:28:55 +0300
Subject: nvme: set the chunk size before freezing the queue
Patch-mainline: v4.15-rc1
Git-commit: 6e78f21ae4488cdab4318f781de05c8ffc4de951
References: FATE#323952, FATE#322506
We don't need a frozen queue to update the chunk_size, which just is a
hint, and moving it a little earlier will allow for some better code
reuse with the multipath code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/nvme/host/core.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1185,12 +1185,13 @@ static void __nvme_revalidate_disk(struc
if (ctrl->nr_streams && ns->sws && ns->sgs)
stream_alignment = ns->sws * ns->sgs;
+ if (ns->noiob)
+ nvme_set_chunk_size(ns);
+
blk_mq_freeze_queue(disk->queue);
blk_integrity_unregister(disk);
blk_queue_logical_block_size(ns->queue, bs);
- if (ns->noiob)
- nvme_set_chunk_size(ns);
if (ns->ms && !ns->ext &&
(ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
nvme_init_integrity(disk, ns->ms, ns->pi_type);