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 8/8] block: remove support for delayed queue registrations Date: Sun, 25 Jul 2021 07:54:58 +0200 [thread overview] Message-ID: <20210725055458.29008-9-hch@lst.de> (raw) In-Reply-To: <20210725055458.29008-1-hch@lst.de> Now that device mapper has been changed to register the disk once it is fully ready all this code is unused. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/elevator.c | 1 - block/genhd.c | 29 +++++++---------------------- include/linux/genhd.h | 6 ------ 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index 52ada14cfe45..706d5a64508d 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -702,7 +702,6 @@ void elevator_init_mq(struct request_queue *q) elevator_put(e); } } -EXPORT_SYMBOL_GPL(elevator_init_mq); /* only for dm-rq */ /* * switch to new_e io scheduler. be careful not to introduce deadlocks - diff --git a/block/genhd.c b/block/genhd.c index e3d93b868ec5..3cd9f165a5a7 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -457,20 +457,20 @@ static void register_disk(struct device *parent, struct gendisk *disk, } /** - * __device_add_disk - add disk information to kernel list + * device_add_disk - add disk information to kernel list * @parent: parent device for the disk * @disk: per-device partitioning information * @groups: Additional per-device sysfs groups - * @register_queue: register the queue if set to true * * This function registers the partitioning information in @disk * with the kernel. * * FIXME: error handling */ -static void __device_add_disk(struct device *parent, struct gendisk *disk, - const struct attribute_group **groups, - bool register_queue) + +void device_add_disk(struct device *parent, struct gendisk *disk, + const struct attribute_group **groups) + { int ret; @@ -480,8 +480,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, * elevator if one is needed, that is, for devices requesting queue * registration. */ - if (register_queue) - elevator_init_mq(disk->queue); + elevator_init_mq(disk->queue); /* * If the driver provides an explicit major number it also must provide @@ -535,8 +534,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, bdev_add(disk->part0, dev->devt); } register_disk(parent, disk, groups); - if (register_queue) - blk_register_queue(disk); + blk_register_queue(disk); /* * Take an extra ref on queue which will be put on disk_release() @@ -550,21 +548,8 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, disk_add_events(disk); blk_integrity_add(disk); } - -void device_add_disk(struct device *parent, struct gendisk *disk, - const struct attribute_group **groups) - -{ - __device_add_disk(parent, disk, groups, true); -} EXPORT_SYMBOL(device_add_disk); -void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk) -{ - __device_add_disk(parent, disk, NULL, false); -} -EXPORT_SYMBOL(device_add_disk_no_queue_reg); - /** * del_gendisk - remove the gendisk * @disk: the struct gendisk to remove diff --git a/include/linux/genhd.h b/include/linux/genhd.h index dd95d53c75fa..fbc4bf269f63 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -218,12 +218,6 @@ static inline void add_disk(struct gendisk *disk) { device_add_disk(NULL, disk, NULL); } -extern void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk); -static inline void add_disk_no_queue_reg(struct gendisk *disk) -{ - device_add_disk_no_queue_reg(NULL, disk); -} - extern void del_gendisk(struct gendisk *gp); void set_disk_ro(struct gendisk *disk, bool read_only); -- 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 8/8] block: remove support for delayed queue registrations Date: Sun, 25 Jul 2021 07:54:58 +0200 [thread overview] Message-ID: <20210725055458.29008-9-hch@lst.de> (raw) In-Reply-To: <20210725055458.29008-1-hch@lst.de> Now that device mapper has been changed to register the disk once it is fully ready all this code is unused. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/elevator.c | 1 - block/genhd.c | 29 +++++++---------------------- include/linux/genhd.h | 6 ------ 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index 52ada14cfe45..706d5a64508d 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -702,7 +702,6 @@ void elevator_init_mq(struct request_queue *q) elevator_put(e); } } -EXPORT_SYMBOL_GPL(elevator_init_mq); /* only for dm-rq */ /* * switch to new_e io scheduler. be careful not to introduce deadlocks - diff --git a/block/genhd.c b/block/genhd.c index e3d93b868ec5..3cd9f165a5a7 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -457,20 +457,20 @@ static void register_disk(struct device *parent, struct gendisk *disk, } /** - * __device_add_disk - add disk information to kernel list + * device_add_disk - add disk information to kernel list * @parent: parent device for the disk * @disk: per-device partitioning information * @groups: Additional per-device sysfs groups - * @register_queue: register the queue if set to true * * This function registers the partitioning information in @disk * with the kernel. * * FIXME: error handling */ -static void __device_add_disk(struct device *parent, struct gendisk *disk, - const struct attribute_group **groups, - bool register_queue) + +void device_add_disk(struct device *parent, struct gendisk *disk, + const struct attribute_group **groups) + { int ret; @@ -480,8 +480,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, * elevator if one is needed, that is, for devices requesting queue * registration. */ - if (register_queue) - elevator_init_mq(disk->queue); + elevator_init_mq(disk->queue); /* * If the driver provides an explicit major number it also must provide @@ -535,8 +534,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, bdev_add(disk->part0, dev->devt); } register_disk(parent, disk, groups); - if (register_queue) - blk_register_queue(disk); + blk_register_queue(disk); /* * Take an extra ref on queue which will be put on disk_release() @@ -550,21 +548,8 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, disk_add_events(disk); blk_integrity_add(disk); } - -void device_add_disk(struct device *parent, struct gendisk *disk, - const struct attribute_group **groups) - -{ - __device_add_disk(parent, disk, groups, true); -} EXPORT_SYMBOL(device_add_disk); -void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk) -{ - __device_add_disk(parent, disk, NULL, false); -} -EXPORT_SYMBOL(device_add_disk_no_queue_reg); - /** * del_gendisk - remove the gendisk * @disk: the struct gendisk to remove diff --git a/include/linux/genhd.h b/include/linux/genhd.h index dd95d53c75fa..fbc4bf269f63 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -218,12 +218,6 @@ static inline void add_disk(struct gendisk *disk) { device_add_disk(NULL, disk, NULL); } -extern void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk); -static inline void add_disk_no_queue_reg(struct gendisk *disk) -{ - device_add_disk_no_queue_reg(NULL, disk); -} - extern void del_gendisk(struct gendisk *gp); void set_disk_ro(struct gendisk *disk, bool read_only); -- 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:58 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 ` [PATCH 6/8] dm: move setting md->type into dm_setup_md_queue Christoph Hellwig 2021-07-25 5:54 ` [dm-devel] " 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 ` Christoph Hellwig [this message] 2021-07-25 5:54 ` [dm-devel] [PATCH 8/8] block: remove support for delayed queue registrations 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 8/8] block: remove support for delayed queue registrations 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-9-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.