diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 05:51:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 05:51:48 +0100 |
| commit | 527d1529e38b36fd22e65711b653ab773179d9e8 (patch) | |
| tree | 46ad2d22dd4af60634fc8e5e2f9980e3af1eb7f2 /drivers/md/dm.c | |
| parent | Merge branch 'for-4.4/lightnvm' of git://git.kernel.dk/linux-block (diff) | |
| parent | block, libnvdimm, nvme: provide a built-in blk_integrity nop profile (diff) | |
| download | linux-527d1529e38b36fd22e65711b653ab773179d9e8.tar.xz linux-527d1529e38b36fd22e65711b653ab773179d9e8.zip | |
Merge branch 'for-4.4/integrity' of git://git.kernel.dk/linux-block
Pull block integrity updates from Jens Axboe:
""This is the joint work of Dan and Martin, cleaning up and improving
the support for block data integrity"
* 'for-4.4/integrity' of git://git.kernel.dk/linux-block:
block, libnvdimm, nvme: provide a built-in blk_integrity nop profile
block: blk_flush_integrity() for bio-based drivers
block: move blk_integrity to request_queue
block: generic request_queue reference counting
nvme: suspend i/o during runtime blk_integrity_unregister
md: suspend i/o during runtime blk_integrity_unregister
md, dm, scsi, nvme, libnvdimm: drop blk_integrity_unregister() at shutdown
block: Inline blk_integrity in struct gendisk
block: Export integrity data interval size in sysfs
block: Reduce the size of struct blk_integrity
block: Consolidate static integrity profile properties
block: Move integrity kobject to struct gendisk
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 1b5c6047e4f1..485760ebba76 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2234,8 +2234,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); } |