Commit d1254a87 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove support for delayed queue registrations 



Now that device mapper has been changed to register the disk once
it is fully ready all this code is unused.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Link: https://lore.kernel.org/r/20210804094147.459763-9-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 89f871af

block/elevator.c

+0 −1
Original line number Diff line number Diff line
@@ -705,7 +705,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 -

block/genhd.c

+7 −22
Original line number Diff line number Diff line
@@ -475,20 +475,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;
@@ -498,7 +498,6 @@ 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);



	/*
@@ -553,7 +552,6 @@ 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);



	/*
@@ -568,21 +566,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

include/linux/genhd.h

+0 −6
Original line number Diff line number Diff line
@@ -219,12 +219,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);