From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>, Mike Snitzer <snitzer@redhat.com>
Cc: dm-devel@redhat.com, linux-block@vger.kernel.org
Subject: [PATCH 5/8] dm: cleanup cleanup_mapped_device
Date: Sun, 25 Jul 2021 07:54:55 +0200 [thread overview]
Message-ID: <20210725055458.29008-6-hch@lst.de> (raw)
In-Reply-To: <20210725055458.29008-1-hch@lst.de>
md->queue is not always set when md->disk is set, so simplify the
conditionas a bit.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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
next prev parent reply other threads:[~2021-07-25 5:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-25 5:54 use regular gendisk registration in device mapper Christoph Hellwig
2021-07-25 5:54 ` [PATCH 1/8] block: make the block holder code optional Christoph Hellwig
2021-07-29 16:25 ` Mike Snitzer
2021-07-25 5:54 ` [PATCH 2/8] block: remove the extra kobject reference in bd_link_disk_holder Christoph Hellwig
2021-07-29 16:27 ` Mike Snitzer
2021-07-25 5:54 ` [PATCH 3/8] block: look up holders by bdev Christoph Hellwig
2021-07-25 5:54 ` [PATCH 4/8] block: support delayed holder registration Christoph Hellwig
2021-07-27 16:06 ` Mike Snitzer
2021-07-28 6:54 ` Christoph Hellwig
2021-07-29 16:32 ` Mike Snitzer
2021-07-25 5:54 ` Christoph Hellwig [this message]
2021-07-29 16:33 ` [PATCH 5/8] dm: cleanup cleanup_mapped_device Mike Snitzer
2021-07-25 5:54 ` [PATCH 6/8] dm: move setting md->type into dm_setup_md_queue Christoph Hellwig
2021-07-29 16:34 ` Mike Snitzer
2021-07-25 5:54 ` [PATCH 7/8] dm: delay registering the gendisk Christoph Hellwig
2021-07-29 16:36 ` Mike Snitzer
2021-07-25 5:54 ` [PATCH 8/8] block: remove support for delayed queue registrations Christoph Hellwig
2021-07-29 16:37 ` Mike Snitzer
2021-07-27 15:58 ` use regular gendisk registration in device mapper Mike Snitzer
2021-07-27 16:02 ` Christoph Hellwig
2021-07-27 16:18 ` Mike Snitzer
2021-07-27 20:38 ` [dm-devel] " Milan Broz
2021-07-28 7:06 ` Christoph Hellwig
2021-07-28 8:37 ` Milan Broz
2021-07-28 11:24 ` Christoph Hellwig
2021-07-29 15:01 ` Milan Broz
2021-07-28 16:17 ` Mike Snitzer
2021-07-29 7:50 ` Milan Broz
2021-07-27 22:52 ` Mike Snitzer
2021-08-04 9:41 use regular gendisk registration in device mapper v2 Christoph Hellwig
2021-08-04 9:41 ` [PATCH 5/8] dm: cleanup cleanup_mapped_device Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210725055458.29008-6-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).