Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: add queue_to_disk() to get gendisk from request_queue

Sometimes we need to get the corresponding gendisk from request_queue.

It is preferred that block drivers store private data in
gendisk->private_data rather than request_queue->queuedata, e.g. see:
commit c4a59c4e5db3 ("dm: stop using ->queuedata").

So if only request_queue is given, we need to get its corresponding
gendisk to get the private data stored in that gendisk.

Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Jeffle Xu and committed by
Jens Axboe
907d5231 cbb749cf

+5 -3
+2
include/linux/blkdev.h
··· 689 689 dma_map_page_attrs(dev, (bv)->bv_page, (bv)->bv_offset, (bv)->bv_len, \ 690 690 (dir), (attrs)) 691 691 692 + #define queue_to_disk(q) (dev_to_disk(kobj_to_dev((q)->kobj.parent))) 693 + 692 694 static inline bool queue_is_mq(struct request_queue *q) 693 695 { 694 696 return q->mq_ops;
+3 -3
include/trace/events/kyber.h
··· 30 30 ), 31 31 32 32 TP_fast_assign( 33 - __entry->dev = disk_devt(dev_to_disk(kobj_to_dev(q->kobj.parent))); 33 + __entry->dev = disk_devt(queue_to_disk(q)); 34 34 strlcpy(__entry->domain, domain, sizeof(__entry->domain)); 35 35 strlcpy(__entry->type, type, sizeof(__entry->type)); 36 36 __entry->percentile = percentile; ··· 59 59 ), 60 60 61 61 TP_fast_assign( 62 - __entry->dev = disk_devt(dev_to_disk(kobj_to_dev(q->kobj.parent))); 62 + __entry->dev = disk_devt(queue_to_disk(q)); 63 63 strlcpy(__entry->domain, domain, sizeof(__entry->domain)); 64 64 __entry->depth = depth; 65 65 ), ··· 81 81 ), 82 82 83 83 TP_fast_assign( 84 - __entry->dev = disk_devt(dev_to_disk(kobj_to_dev(q->kobj.parent))); 84 + __entry->dev = disk_devt(queue_to_disk(q)); 85 85 strlcpy(__entry->domain, domain, sizeof(__entry->domain)); 86 86 ), 87 87