MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: better split mq vs non-mq code in add_disk_fwnode

Browse Source 
Add a big conditional for blk-mq vs not mq at the beginning of
add_disk_fwnode so that elevator_init_mq is only called for blk-mq disks,
and add checks that the right methods or set or not set based on the
queue type.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20250106083531.799976-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2025-01-06 09:35:08 +01:00 committed by Jens Axboe
parent b7175e24d6
commit 6783811569
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
block/genhd.c
View File

@ -400,21 +400,23 @@ int __must_check add_disk_fwnode(struct device *parent, struct gendisk *disk,
struct device *ddev = disk_to_dev(disk); struct device *ddev = disk_to_dev(disk);
int ret; int ret;
/* Only makes sense for bio-based to set ->poll_bio */ if (queue_is_mq(disk->queue)) {
if (queue_is_mq(disk->queue) && disk->fops->poll_bio) /*
return -EINVAL; * ->submit_bio and ->poll_bio are bypassed for blk-mq drivers.
*/
if (disk->fops->submit_bio || disk->fops->poll_bio)
return -EINVAL;
/* /*
* The disk queue should now be all set with enough information about * Initialize the I/O scheduler code and pick a default one if
* the device for the elevator code to pick an adequate default * needed.
* elevator if one is needed, that is, for devices requesting queue */
* registration. elevator_init_mq(disk->queue);
*/ } else {
elevator_init_mq(disk->queue); if (!disk->fops->submit_bio)
return -EINVAL;
/* Mark bdev as having a submit_bio, if needed */
if (disk->fops->submit_bio)
bdev_set_flag(disk->part0, BD_HAS_SUBMIT_BIO); bdev_set_flag(disk->part0, BD_HAS_SUBMIT_BIO);
}
/* /*
* If the driver provides an explicit major number it also must provide * If the driver provides an explicit major number it also must provide