Commit 74a2b6ec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Link: https://lore.kernel.org/r/20210804094147.459763-6-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d6263387
...@@ -1694,13 +1694,9 @@ static void cleanup_mapped_device(struct mapped_device *md) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment