| Message ID | 20220921180501.1539876-10-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/17] blk-cgroup: fix error unwinding in blkcg_init_queue | expand |
On Wed, Sep 21, 2022 at 08:04:53PM +0200, Christoph Hellwig wrote: > Just directly dereference the disk name instead of going through multiple > hoops to find the same value. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/blk-iocost.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) Reviewed-by: Andreas Herrmann <aherrmann@suse.de> > diff --git a/block/blk-iocost.c b/block/blk-iocost.c > index 7936e5f5821c7..cba9d3ad58e16 100644 > --- a/block/blk-iocost.c > +++ b/block/blk-iocost.c > @@ -664,17 +664,13 @@ static struct ioc *q_to_ioc(struct request_queue *q) > return rqos_to_ioc(rq_qos_id(q, RQ_QOS_COST)); > } > > -static const char *q_name(struct request_queue *q) > -{ > - if (blk_queue_registered(q)) > - return kobject_name(q->kobj.parent); > - else > - return "<unknown>"; > -} > - > static const char __maybe_unused *ioc_name(struct ioc *ioc) > { > - return q_name(ioc->rqos.q); > + struct gendisk *disk = ioc->rqos.q->disk; > + > + if (!disk) > + return "<unknown>"; > + return disk->disk_name; > } > > static struct ioc_gq *pd_to_iocg(struct blkg_policy_data *pd) > -- > 2.30.2 >
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 7936e5f5821c7..cba9d3ad58e16 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -664,17 +664,13 @@ static struct ioc *q_to_ioc(struct request_queue *q) return rqos_to_ioc(rq_qos_id(q, RQ_QOS_COST)); } -static const char *q_name(struct request_queue *q) -{ - if (blk_queue_registered(q)) - return kobject_name(q->kobj.parent); - else - return "<unknown>"; -} - static const char __maybe_unused *ioc_name(struct ioc *ioc) { - return q_name(ioc->rqos.q); + struct gendisk *disk = ioc->rqos.q->disk; + + if (!disk) + return "<unknown>"; + return disk->disk_name; } static struct ioc_gq *pd_to_iocg(struct blkg_policy_data *pd)
Just directly dereference the disk name instead of going through multiple hoops to find the same value. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-iocost.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)