On Sun, Jul 25 2021 at 1:54P -0400, Christoph Hellwig <hch@xxxxxx> wrote: > md->queue is not always set when md->disk is set, so simplify the > conditionas a bit. s/not/now/ s/conditionas/conditionals/ > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> Reviewed-by: Mike Snitzer <snitzer@xxxxxxxxxx> > --- > drivers/md/dm.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/md/dm.c b/drivers/md/dm.c > index 2c5f9e585211..7971ec8ce677 100644 > --- 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); > > -- > 2.30.2 >