Commit 414c62e2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Keith Busch
Browse files

nvme: move blk_integrity_unregister into nvme_init_integrity 



Move uneregistering the existing integrity profile into the helper
dealing with all the other integrity / metadata setup.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent f467b48e

drivers/nvme/host/core.c

+2 −2
Original line number Diff line number Diff line
@@ -1727,6 +1727,8 @@ static bool nvme_init_integrity(struct gendisk *disk, struct nvme_ns_head *head) 
{

	struct blk_integrity integrity = { };



	blk_integrity_unregister(disk);



	if (!head->ms)

		return true;
@@ -1980,8 +1982,6 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk, 
		bs = (1 << 9);

	}



	blk_integrity_unregister(disk);



	atomic_bs = phys_bs = bs;

	if (id->nabo == 0) {

		/*