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 6/8] dm: move setting md->type into dm_setup_md_queue Date: Sun, 25 Jul 2021 07:54:56 +0200 [thread overview] Message-ID: <20210725055458.29008-7-hch@lst.de> (raw) In-Reply-To: <20210725055458.29008-1-hch@lst.de> Move setting md->type from both callers into dm_setup_md_queue. This ensures that md->type is only set to a valid value after the queue has been fully setup, something we'll rely on future changes. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/md/dm-ioctl.c | 4 ---- drivers/md/dm.c | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 2209cbcd84db..2575074a2204 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1436,9 +1436,6 @@ static int table_load(struct file *filp, struct dm_ioctl *param, size_t param_si } if (dm_get_md_type(md) == DM_TYPE_NONE) { - /* Initial table load: acquire type of table. */ - dm_set_md_type(md, dm_table_get_type(t)); - /* setup md->queue to reflect md's type (may block) */ r = dm_setup_md_queue(md, t); if (r) { @@ -2187,7 +2184,6 @@ int __init dm_early_create(struct dm_ioctl *dmi, if (r) goto err_destroy_table; - md->type = dm_table_get_type(t); /* setup md->queue to reflect md's type (may block) */ r = dm_setup_md_queue(md, t); if (r) { diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 7971ec8ce677..f003bd5b93ce 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2052,9 +2052,9 @@ EXPORT_SYMBOL_GPL(dm_get_queue_limits); */ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) { - int r; + enum dm_queue_mode type = dm_table_get_type(t); struct queue_limits limits; - enum dm_queue_mode type = dm_get_md_type(md); + int r; switch (type) { case DM_TYPE_REQUEST_BASED: @@ -2081,6 +2081,7 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) r = dm_table_set_restrictions(t, md->queue, &limits); if (r) return r; + md->type = type; blk_register_queue(md->disk); -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk>, Mike Snitzer <snitzer@redhat.com> Cc: linux-block@vger.kernel.org, dm-devel@redhat.com Subject: [dm-devel] [PATCH 6/8] dm: move setting md->type into dm_setup_md_queue Date: Sun, 25 Jul 2021 07:54:56 +0200 [thread overview] Message-ID: <20210725055458.29008-7-hch@lst.de> (raw) In-Reply-To: <20210725055458.29008-1-hch@lst.de> Move setting md->type from both callers into dm_setup_md_queue. This ensures that md->type is only set to a valid value after the queue has been fully setup, something we'll rely on future changes. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/md/dm-ioctl.c | 4 ---- drivers/md/dm.c | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 2209cbcd84db..2575074a2204 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1436,9 +1436,6 @@ static int table_load(struct file *filp, struct dm_ioctl *param, size_t param_si } if (dm_get_md_type(md) == DM_TYPE_NONE) { - /* Initial table load: acquire type of table. */ - dm_set_md_type(md, dm_table_get_type(t)); - /* setup md->queue to reflect md's type (may block) */ r = dm_setup_md_queue(md, t); if (r) { @@ -2187,7 +2184,6 @@ int __init dm_early_create(struct dm_ioctl *dmi, if (r) goto err_destroy_table; - md->type = dm_table_get_type(t); /* setup md->queue to reflect md's type (may block) */ r = dm_setup_md_queue(md, t); if (r) { diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 7971ec8ce677..f003bd5b93ce 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2052,9 +2052,9 @@ EXPORT_SYMBOL_GPL(dm_get_queue_limits); */ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) { - int r; + enum dm_queue_mode type = dm_table_get_type(t); struct queue_limits limits; - enum dm_queue_mode type = dm_get_md_type(md); + int r; switch (type) { case DM_TYPE_REQUEST_BASED: @@ -2081,6 +2081,7 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) r = dm_table_set_restrictions(t, md->queue, &limits); if (r) return r; + md->type = type; blk_register_queue(md->disk); -- 2.30.2 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2021-07-25 5:57 UTC|newest] Thread overview: 59+ 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 ` [dm-devel] " Christoph Hellwig 2021-07-25 5:54 ` [PATCH 1/8] block: make the block holder code optional Christoph Hellwig 2021-07-25 5:54 ` [dm-devel] " Christoph Hellwig 2021-07-29 16:25 ` Mike Snitzer 2021-07-29 16:25 ` [dm-devel] " 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-25 5:54 ` [dm-devel] " Christoph Hellwig 2021-07-29 16:27 ` Mike Snitzer 2021-07-29 16:27 ` [dm-devel] " Mike Snitzer 2021-07-25 5:54 ` [PATCH 3/8] block: look up holders by bdev Christoph Hellwig 2021-07-25 5:54 ` [dm-devel] " Christoph Hellwig 2021-07-25 5:54 ` [PATCH 4/8] block: support delayed holder registration Christoph Hellwig 2021-07-25 5:54 ` [dm-devel] " Christoph Hellwig 2021-07-27 16:06 ` Mike Snitzer 2021-07-27 16:06 ` [dm-devel] " Mike Snitzer 2021-07-28 6:54 ` Christoph Hellwig 2021-07-28 6:54 ` [dm-devel] " Christoph Hellwig 2021-07-29 16:32 ` Mike Snitzer 2021-07-29 16:32 ` [dm-devel] " Mike Snitzer 2021-07-25 5:54 ` [PATCH 5/8] dm: cleanup cleanup_mapped_device Christoph Hellwig 2021-07-25 5:54 ` [dm-devel] " Christoph Hellwig 2021-07-29 16:33 ` Mike Snitzer 2021-07-29 16:33 ` [dm-devel] " Mike Snitzer 2021-07-25 5:54 ` Christoph Hellwig [this message] 2021-07-25 5:54 ` [dm-devel] [PATCH 6/8] dm: move setting md->type into dm_setup_md_queue Christoph Hellwig 2021-07-29 16:34 ` Mike Snitzer 2021-07-29 16:34 ` [dm-devel] " Mike Snitzer 2021-07-25 5:54 ` [PATCH 7/8] dm: delay registering the gendisk Christoph Hellwig 2021-07-25 5:54 ` [dm-devel] " Christoph Hellwig 2021-07-29 16:36 ` Mike Snitzer 2021-07-29 16:36 ` [dm-devel] " Mike Snitzer 2021-07-25 5:54 ` [PATCH 8/8] block: remove support for delayed queue registrations Christoph Hellwig 2021-07-25 5:54 ` [dm-devel] " Christoph Hellwig 2021-07-29 16:37 ` Mike Snitzer 2021-07-29 16:37 ` [dm-devel] " Mike Snitzer 2021-07-27 15:58 ` use regular gendisk registration in device mapper Mike Snitzer 2021-07-27 15:58 ` [dm-devel] " Mike Snitzer 2021-07-27 16:02 ` Christoph Hellwig 2021-07-27 16:02 ` [dm-devel] " Christoph Hellwig 2021-07-27 16:18 ` Mike Snitzer 2021-07-27 16:18 ` [dm-devel] " Mike Snitzer 2021-07-27 20:38 ` Milan Broz 2021-07-27 20:38 ` Milan Broz 2021-07-28 7:06 ` Christoph Hellwig 2021-07-28 7:06 ` Christoph Hellwig 2021-07-28 8:37 ` Milan Broz 2021-07-28 8:37 ` Milan Broz 2021-07-28 11:24 ` Christoph Hellwig 2021-07-28 11:24 ` Christoph Hellwig 2021-07-29 15:01 ` Milan Broz 2021-07-29 15:01 ` Milan Broz 2021-07-28 16:17 ` Mike Snitzer 2021-07-28 16:17 ` [dm-devel] " Mike Snitzer 2021-07-29 7:50 ` Milan Broz 2021-07-29 7:50 ` [dm-devel] " Milan Broz 2021-07-27 22:52 ` Mike Snitzer 2021-07-27 22:52 ` [dm-devel] " Mike Snitzer 2021-08-04 9:41 use regular gendisk registration in device mapper v2 Christoph Hellwig 2021-08-04 9:41 ` [PATCH 6/8] dm: move setting md->type into dm_setup_md_queue 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-7-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.