From: Christoph Hellwig <hch@lst.de>
Date: Sun, 6 Jun 2021 10:38:23 +0000 (+0200)
Subject: nvme: remve the blk_get_integrity check before blk_integrity_unregister
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e01199eeb8bd14a57e7ad9710553511d21e559cf;p=users%2Fhch%2Fblock.git

nvme: remve the blk_get_integrity check before blk_integrity_unregister

We can always just overwrite the integrity profile.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 24bcae88587a..0dae30f5d21d 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3776,8 +3776,7 @@ static void nvme_ns_remove(struct nvme_ns *ns)
 			nvme_cdev_del(&ns->cdev, &ns->cdev_device);
 		del_gendisk(ns->disk);
 		blk_cleanup_queue(ns->queue);
-		if (blk_get_integrity(ns->disk))
-			blk_integrity_unregister(ns->disk);
+		blk_integrity_unregister(ns->disk);
 	}
 
 	down_write(&ns->ctrl->namespaces_rwsem);