Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e78f21a authored Nov 02, 2017 by Christoph Hellwig Committed by Jens Axboe Nov 10, 2017

nvme: set the chunk size before freezing the queue



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>

parent 30e5e929

drivers/nvme/host/core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1184,12 +1184,13 @@ static void __nvme_revalidate_disk(struct gendisk disk, struct nvme_id_ns id)
		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);