Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9609b994 authored by Dan Williams's avatar Dan Williams Committed by Jens Axboe
Browse files

md, dm, scsi, nvme, libnvdimm: drop blk_integrity_unregister() at shutdown 



Now that the integrity profile is statically allocated there is no work
to do when shutting down an integrity enabled block device.

Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: James Bottomley <JBottomley@Odin.com>
Acked-by: default avatarNeilBrown <neilb@suse.com>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
Acked-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Tested-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 25520d55

drivers/md/dm.c

+0 −2
Original line number Diff line number Diff line
@@ -2233,8 +2233,6 @@ static void cleanup_mapped_device(struct mapped_device *md) 
		spin_lock(&_minor_lock);

		md->disk->private_data = NULL;

		spin_unlock(&_minor_lock);

		if (blk_get_integrity(md->disk))

			blk_integrity_unregister(md->disk);

		del_gendisk(md->disk);

		put_disk(md->disk);

	}

drivers/md/md.c

+0 −1
Original line number Diff line number Diff line
@@ -5539,7 +5539,6 @@ static int do_md_stop(struct mddev *mddev, int mode, 
		if (mddev->hold_active == UNTIL_STOP)

			mddev->hold_active = 0;

	}

	blk_integrity_unregister(disk);

	md_new_event(mddev);

	sysfs_notify_dirent_safe(mddev->sysfs_state);

	return 0;

drivers/nvdimm/btt.c

+0 −1
Original line number Diff line number Diff line
@@ -1279,7 +1279,6 @@ static int btt_blk_init(struct btt *btt) 


static void btt_blk_cleanup(struct btt *btt)

{

	blk_integrity_unregister(btt->btt_disk);

	del_gendisk(btt->btt_disk);

	put_disk(btt->btt_disk);

	blk_cleanup_queue(btt->btt_queue);

drivers/nvme/host/pci.c

+1 −4
Original line number Diff line number Diff line
@@ -2407,11 +2407,8 @@ static void nvme_ns_remove(struct nvme_ns *ns) 


	if (kill)

		blk_set_queue_dying(ns->queue);

	if (ns->disk->flags & GENHD_FL_UP) {

		if (blk_get_integrity(ns->disk))

			blk_integrity_unregister(ns->disk);

	if (ns->disk->flags & GENHD_FL_UP)

		del_gendisk(ns->disk);

	}

	if (kill || !blk_queue_dying(ns->queue)) {

		blk_mq_abort_requeue_list(ns->queue);

		blk_cleanup_queue(ns->queue);

drivers/scsi/sd.c

+0 −1
Original line number Diff line number Diff line
@@ -3068,7 +3068,6 @@ static void scsi_disk_release(struct device *dev) 
	ida_remove(&sd_index_ida, sdkp->index);

	spin_unlock(&sd_index_lock);



	blk_integrity_unregister(disk);

	disk->private_data = NULL;

	put_disk(disk);

	put_device(&sdkp->device->sdev_gendev);