| Message ID | 20210608230703.19510-4-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Improve I/O priority support | expand |
On 2021/06/09 8:07, Bart Van Assche wrote: > rq_qos_id_to_name() is not in the hot path so move it from a .h into a .c > file. > > Cc: Damien Le Moal <damien.lemoal@wdc.com> > Cc: Hannes Reinecke <hare@suse.de> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Ming Lei <ming.lei@redhat.com> > Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Cc: Himanshu Madhani <himanshu.madhani@oracle.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > block/blk-rq-qos.c | 13 +++++++++++++ > block/blk-rq-qos.h | 13 +------------ > 2 files changed, 14 insertions(+), 12 deletions(-) > > diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c > index 656460636ad3..61dccf584c68 100644 > --- a/block/blk-rq-qos.c > +++ b/block/blk-rq-qos.c > @@ -2,6 +2,19 @@ > > #include "blk-rq-qos.h" > > +const char *rq_qos_id_to_name(enum rq_qos_id id) > +{ > + switch (id) { > + case RQ_QOS_WBT: > + return "wbt"; > + case RQ_QOS_LATENCY: > + return "latency"; > + case RQ_QOS_COST: > + return "cost"; > + } > + return "unknown"; > +} > + > /* > * Increment 'v', if 'v' is below 'below'. Returns true if we succeeded, > * false if 'v' + 1 would be bigger than 'below'. > diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h > index 2bc43e94f4c4..6b5f9ae69883 100644 > --- a/block/blk-rq-qos.h > +++ b/block/blk-rq-qos.h > @@ -78,18 +78,7 @@ static inline struct rq_qos *blkcg_rq_qos(struct request_queue *q) > return rq_qos_id(q, RQ_QOS_LATENCY); > } > > -static inline const char *rq_qos_id_to_name(enum rq_qos_id id) > -{ > - switch (id) { > - case RQ_QOS_WBT: > - return "wbt"; > - case RQ_QOS_LATENCY: > - return "latency"; > - case RQ_QOS_COST: > - return "cost"; > - } > - return "unknown"; > -} > +const char *rq_qos_id_to_name(enum rq_qos_id id); > > static inline void rq_wait_init(struct rq_wait *rq_wait) > { > Looks OK, but since the only caller is in blk-mq-debugfs.c, the function could be moved there and be static, no ? Anyway, Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
On 6/9/21 1:06 AM, Bart Van Assche wrote: > rq_qos_id_to_name() is not in the hot path so move it from a .h into a .c > file. > > Cc: Damien Le Moal <damien.lemoal@wdc.com> > Cc: Hannes Reinecke <hare@suse.de> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Ming Lei <ming.lei@redhat.com> > Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Cc: Himanshu Madhani <himanshu.madhani@oracle.com> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > block/blk-rq-qos.c | 13 +++++++++++++ > block/blk-rq-qos.h | 13 +------------ > 2 files changed, 14 insertions(+), 12 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c index 656460636ad3..61dccf584c68 100644 --- a/block/blk-rq-qos.c +++ b/block/blk-rq-qos.c @@ -2,6 +2,19 @@ #include "blk-rq-qos.h" +const char *rq_qos_id_to_name(enum rq_qos_id id) +{ + switch (id) { + case RQ_QOS_WBT: + return "wbt"; + case RQ_QOS_LATENCY: + return "latency"; + case RQ_QOS_COST: + return "cost"; + } + return "unknown"; +} + /* * Increment 'v', if 'v' is below 'below'. Returns true if we succeeded, * false if 'v' + 1 would be bigger than 'below'. diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index 2bc43e94f4c4..6b5f9ae69883 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -78,18 +78,7 @@ static inline struct rq_qos *blkcg_rq_qos(struct request_queue *q) return rq_qos_id(q, RQ_QOS_LATENCY); } -static inline const char *rq_qos_id_to_name(enum rq_qos_id id) -{ - switch (id) { - case RQ_QOS_WBT: - return "wbt"; - case RQ_QOS_LATENCY: - return "latency"; - case RQ_QOS_COST: - return "cost"; - } - return "unknown"; -} +const char *rq_qos_id_to_name(enum rq_qos_id id); static inline void rq_wait_init(struct rq_wait *rq_wait) {
rq_qos_id_to_name() is not in the hot path so move it from a .h into a .c file. Cc: Damien Le Moal <damien.lemoal@wdc.com> Cc: Hannes Reinecke <hare@suse.de> Cc: Christoph Hellwig <hch@lst.de> Cc: Ming Lei <ming.lei@redhat.com> Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com> Cc: Himanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- block/blk-rq-qos.c | 13 +++++++++++++ block/blk-rq-qos.h | 13 +------------ 2 files changed, 14 insertions(+), 12 deletions(-)