Skip to content

Commit 74a2b6e

Browse files
Christoph Hellwigaxboe
authored andcommitted
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 <[email protected]> Reviewed-by: Mike Snitzer <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent d626338 commit 74a2b6e

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/md/dm.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,13 +1694,9 @@ static void cleanup_mapped_device(struct mapped_device *md)
16941694
md->disk->private_data = NULL;
16951695
spin_unlock(&_minor_lock);
16961696
del_gendisk(md->disk);
1697-
}
1698-
1699-
if (md->queue)
17001697
dm_queue_destroy_keyslot_manager(md->queue);
1701-
1702-
if (md->disk)
17031698
blk_cleanup_disk(md->disk);
1699+
}
17041700

17051701
cleanup_srcu_struct(&md->io_barrier);
17061702

0 commit comments

Comments
 (0)