p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>
Link: https://lore.kernel.org/r/20210804094147.459763-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-08-04 11:41:47 +02:00 committed by Jens Axboe
parent 89f871af1b
commit d1254a8749
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/elevator.c
View File

@ -705,7 +705,6 @@ void elevator_init_mq(struct request_queue *q)
elevator_put(e); 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 - * switch to new_e io scheduler. be careful not to introduce deadlocks -

25
block/genhd.c
View File

@ -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 * @parent: parent device for the disk
* @disk: per-device partitioning information * @disk: per-device partitioning information
* @groups: Additional per-device sysfs groups * @groups: Additional per-device sysfs groups
* @register_queue: register the queue if set to true
* *
* This function registers the partitioning information in @disk * This function registers the partitioning information in @disk
* with the kernel. * with the kernel.
* *
* FIXME: error handling * FIXME: error handling
*/ */
static void __device_add_disk(struct device *parent, struct gendisk *disk,
const struct attribute_group **groups, void device_add_disk(struct device *parent, struct gendisk *disk,
bool register_queue) const struct attribute_group **groups)
{ {
int ret; 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 * elevator if one is needed, that is, for devices requesting queue
* registration. * registration.
*/ */
if (register_queue)
elevator_init_mq(disk->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); bdev_add(disk->part0, dev->devt);
} }
register_disk(parent, disk, groups); register_disk(parent, disk, groups);
if (register_queue)
blk_register_queue(disk); blk_register_queue(disk);
/* /*
@ -568,21 +566,8 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
disk_add_events(disk); disk_add_events(disk);
blk_integrity_add(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); 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 * del_gendisk - remove the gendisk
* @disk: the struct gendisk to remove * @disk: the struct gendisk to remove

6
include/linux/genhd.h
View File

@ -219,12 +219,6 @@ static inline void add_disk(struct gendisk *disk)
{ {
device_add_disk(NULL, disk, NULL); 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); extern void del_gendisk(struct gendisk *gp);
void set_disk_ro(struct gendisk *disk, bool read_only); void set_disk_ro(struct gendisk *disk, bool read_only);