Commit 4b9d5b15 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

NVMe: Simplify metadata setup 



We no longer require the two-pass setup for block integrity.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 53029b04

drivers/nvme/host/core.c

+3 −25
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ static int nvme_revalidate_disk(struct gendisk *disk) 
	if (ns->lba_shift == 0)

		ns->lba_shift = 9;

	bs = 1 << ns->lba_shift;



	/* XXX: PI implementation requires metadata equal t10 pi tuple size */

	pi_type = ns->ms == sizeof(struct t10_pi_tuple) ?

					id->dps & NVME_NS_DPS_PI_MASK : 0;
@@ -591,9 +590,8 @@ static int nvme_revalidate_disk(struct gendisk *disk) 
	ns->pi_type = pi_type;

	blk_queue_logical_block_size(ns->queue, bs);



	if (ns->ms && !ns->ext)

	if (ns->ms && !blk_get_integrity(disk) && !ns->ext)

		nvme_init_integrity(ns);



	if (ns->ms && !(ns->ms == 8 && ns->pi_type) && !blk_get_integrity(disk))

		set_capacity(disk, 0);

	else
@@ -1002,7 +1000,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	ns->ns_id = nsid;

	ns->disk = disk;

	ns->lba_shift = 9; /* set to a default value for 512 until disk is validated */

	list_add_tail(&ns->list, &ctrl->namespaces);



	blk_queue_logical_block_size(ns->queue, 1 << ns->lba_shift);

	if (ctrl->max_hw_sectors) {
@@ -1025,36 +1022,17 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	disk->flags = GENHD_FL_EXT_DEVT;

	sprintf(disk->disk_name, "nvme%dn%d", ctrl->instance, nsid);



	/*

	 * Initialize capacity to 0 until we establish the namespace format and

	 * setup integrity extentions if necessary. The revalidate_disk after

	 * add_disk allows the driver to register with integrity if the format

	 * requires it.

	 */

	set_capacity(disk, 0);

	if (nvme_revalidate_disk(ns->disk))

		goto out_free_disk;



	list_add_tail(&ns->list, &ctrl->namespaces);

	kref_get(&ctrl->kref);

	if (ns->type != NVME_NS_LIGHTNVM) {

	if (ns->type != NVME_NS_LIGHTNVM)

		add_disk(ns->disk);

		if (ns->ms) {

			struct block_device *bd = bdget_disk(ns->disk, 0);

			if (!bd)

				return;

			if (blkdev_get(bd, FMODE_READ, NULL)) {

				bdput(bd);

				return;

			}

			blkdev_reread_part(bd);

			blkdev_put(bd, FMODE_READ);

		}

	}



	return;

 out_free_disk:

	kfree(disk);

	list_del(&ns->list);

 out_free_queue:

	blk_cleanup_queue(ns->queue);

 out_free_ns: