path: root/block/genhd.c
diff options
authorPavel Begunkov <>2021-10-14 15:03:26 +0100
committerJens Axboe <>2021-10-18 06:17:36 -0600
commit17220ca5ce9606c1b015c4316fca18734c2df0bb (patch)
tree97ed1d00b00c850cc3f1cd08bf110418ccc0fd0b /block/genhd.c
parentabd45c159df5fcb7ac820e2825dac85de7c01c21 (diff)
block: cache request queue in bdev
There are tons of places where we need to get a request_queue only having bdev, which turns into bdev->bd_disk->queue. There are probably a hundred of such places considering inline helpers, and enough of them are in hot paths. Cache queue pointer in struct block_device and make use of it in bdev_get_queue(). Signed-off-by: Pavel Begunkov <> Link: Signed-off-by: Jens Axboe <>
Diffstat (limited to 'block/genhd.c')
1 files changed, 3 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index ffbdb9b24555..d148c38450d7 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1267,6 +1267,9 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
if (!disk->bdi)
goto out_free_disk;
+ /* bdev_alloc() might need the queue, set before the first call */
+ disk->queue = q;
disk->part0 = bdev_alloc(disk, 0);
if (!disk->part0)
goto out_free_bdi;
@@ -1282,7 +1285,6 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
disk_to_dev(disk)->type = &disk_type;
- disk->queue = q;
q->disk = disk;
lockdep_init_map(&disk->lockdep_map, "(bio completion)", lkclass, 0);