mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-11 16:29:05 +00:00
dm: cleanup cleanup_mapped_device
md->queue is now always set when md->disk is set, so simplify the conditionals a bit. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mike Snitzer <snitzer@redhat.com> Link: https://lore.kernel.org/r/20210804094147.459763-6-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
d626338735
commit
74a2b6ec93
@ -1694,13 +1694,9 @@ static void cleanup_mapped_device(struct mapped_device *md)
|
|||||||
md->disk->private_data = NULL;
|
md->disk->private_data = NULL;
|
||||||
spin_unlock(&_minor_lock);
|
spin_unlock(&_minor_lock);
|
||||||
del_gendisk(md->disk);
|
del_gendisk(md->disk);
|
||||||
}
|
|
||||||
|
|
||||||
if (md->queue)
|
|
||||||
dm_queue_destroy_keyslot_manager(md->queue);
|
dm_queue_destroy_keyslot_manager(md->queue);
|
||||||
|
|
||||||
if (md->disk)
|
|
||||||
blk_cleanup_disk(md->disk);
|
blk_cleanup_disk(md->disk);
|
||||||
|
}
|
||||||
|
|
||||||
cleanup_srcu_struct(&md->io_barrier);
|
cleanup_srcu_struct(&md->io_barrier);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user