On Sun, Jul 25 2021 at 1:54P -0400,
Christoph Hellwig <hch@xxxxxx> wrote:
> 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@xxxxxx>
Reviewed-by: Mike Snitzer <snitzer@xxxxxxxxxx>
> ---
> 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@xxxxxxxxxx
https://listman.redhat.com/mailman/listinfo/dm-devel
