|
@@ -2965,8 +2965,6 @@ static void nvme_ns_remove(struct nvme_ns *ns)
|
|
|
return;
|
|
|
|
|
|
if (ns->disk && ns->disk->flags & GENHD_FL_UP) {
|
|
|
- if (blk_get_integrity(ns->disk))
|
|
|
- blk_integrity_unregister(ns->disk);
|
|
|
nvme_mpath_remove_disk_links(ns);
|
|
|
sysfs_remove_group(&disk_to_dev(ns->disk)->kobj,
|
|
|
&nvme_ns_id_attr_group);
|
|
@@ -2974,6 +2972,8 @@ static void nvme_ns_remove(struct nvme_ns *ns)
|
|
|
nvme_nvm_unregister_sysfs(ns);
|
|
|
del_gendisk(ns->disk);
|
|
|
blk_cleanup_queue(ns->queue);
|
|
|
+ if (blk_get_integrity(ns->disk))
|
|
|
+ blk_integrity_unregister(ns->disk);
|
|
|
}
|
|
|
|
|
|
mutex_lock(&ns->ctrl->subsys->lock);
|