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>

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 2c5f9e58521179af3bf5ed2dd9ed0940cb2d0cc4..7971ec8ce677f986b03563cd0ee194a081fd853c 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1694,13 +1694,9 @@ static void cleanup_mapped_device(struct mapped_device *md)
                md->disk->private_data = NULL;
                spin_unlock(&_minor_lock);
                del_gendisk(md->disk);
-       }
-
-       if (md->queue)
                dm_queue_destroy_keyslot_manager(md->queue);
-
-       if (md->disk)
                blk_cleanup_disk(md->disk);
+       }
 
        cleanup_srcu_struct(&md->io_barrier);