nvme: move blk_integrity_unregister into nvme_init_integrity

Christoph Hellwig · keithbusch · commit 414c62e2ce5d · 2024-03-04T08:24:56.000-08:00
Move uneregistering the existing integrity profile into the helper
dealing with all the other integrity / metadata setup.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Reviewed-by: Max Gurtovoy &lt;mgurtovoy@nvidia.com&gt;
Signed-off-by: Keith Busch &lt;kbusch@kernel.org&gt;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -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) {
 		/*

Original file line number	Diff line number	Diff line change
`@@ -1727,6 +1727,8 @@ static bool nvme_init_integrity(struct gendisk disk, struct nvme_ns_head head)`
`1727`	`1727`	`{`
`1728`	`1728`	`struct blk_integrity integrity = { };`
`1729`	`1729`
	`1730`	`+ blk_integrity_unregister(disk);`
	`1731`	`+`
`1730`	`1732`	`if (!head->ms)`
`1731`	`1733`	`return true;`
`1732`	`1734`
`@@ -1980,8 +1982,6 @@ static void nvme_update_disk_info(struct nvme_ctrl ctrl, struct gendisk disk,`
`1980`	`1982`	`bs = (1 << 9);`
`1981`	`1983`	`}`
`1982`	`1984`
`1983`		`- blk_integrity_unregister(disk);`
`1984`		`-`
`1985`	`1985`	`atomic_bs = phys_bs = bs;`
`1986`	`1986`	`if (id->nabo == 0) {`
`1987`	`1987`	`/*`