]> www.infradead.org Git - users/hch/block.git/commitdiff
nvme: remve the blk_get_integrity check before blk_integrity_unregister
authorChristoph Hellwig <hch@lst.de>
Sun, 6 Jun 2021 10:38:23 +0000 (12:38 +0200)
committerChristoph Hellwig <hch@lst.de>
Sun, 6 Jun 2021 12:21:14 +0000 (14:21 +0200)
We can always just overwrite the integrity profile.

Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/core.c

index 24bcae88587a504abd90ed6032fef3c539bb6c07..0dae30f5d21d8cea75d9ea4c12a8b0bd2df306d7 100644 (file)
@@ -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);