diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-10-21 17:19:55 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-21 20:43:37 (GMT) |
| commit | 9609b9942b180a50b0162419abd2932a41117fe9 (patch) | |
| tree | 5610d403751401e5675fe6d1f13c25c6b18794ae /drivers/md | |
| parent | 25520d55cdb6ee289abc68f553d364d22478ff54 (diff) | |
| download | linux-9609b9942b180a50b0162419abd2932a41117fe9.tar.xz | |
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: NeilBrown <neilb@suse.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Acked-by: Vishal Verma <vishal.l.verma@intel.com>
Tested-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm.c | 2 | ||||
| -rw-r--r-- | drivers/md/md.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 6264781..f4d953e 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -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); } diff --git a/drivers/md/md.c b/drivers/md/md.c index 2af9d59..7d07cac 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -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; |