[PATCH v3 2/2] block: open-code blkg_path in it's sole caller
From: Johannes Thumshirn <hidden>
Date: 2020-06-29 18:48:29
Subsystem:
bfq i/o scheduler, block layer, control group - block io controller (blkio), the rest · Maintainers:
Yu Kuai, Jens Axboe, Tejun Heo, Josef Bacik, Linus Torvalds
blkg_path() is a trivial one-line helper that only has a single caller, bfq_bic_update_cgroup(). Remove blkg_path() and open-code it in bfq_bic_update_cgroup(). Signed-off-by: Johannes Thumshirn <redacted> Reviewed-by: Christoph Hellwig <hch@lst.de> --- block/bfq-cgroup.c | 3 ++- include/linux/blk-cgroup.h | 14 -------------- 2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 68882b9b8f11..8fe7d47eb4dd 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c@@ -794,7 +794,8 @@ void bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio) * refcounter for bfqg, to let it disappear only after no * bfq_queue refers to it any longer. */ - blkg_path(bfqg_to_blkg(bfqg), bfqg->blkg_path, sizeof(bfqg->blkg_path)); + cgroup_path(bfqg_to_blkg(bfqg)->blkcg->css.cgroup, bfqg->blkg_path, + sizeof(bfqg->blkg_path)); bic->blkcg_serial_nr = serial_nr; out: rcu_read_unlock();
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index 6aa633cedfb0..5f2aea4d1c43 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h@@ -433,19 +433,6 @@ static inline void blkcg_unpin_online(struct blkcg *blkcg) } while (blkcg); } -/** - * blkg_path - format cgroup path of blkg - * @blkg: blkg of interest - * @buf: target buffer - * @buflen: target buffer length - * - * Format the path of the cgroup of @blkg into @buf. - */ -static inline int blkg_path(struct blkcg_gq *blkg, char *buf, int buflen) -{ - return cgroup_path(blkg->blkcg->css.cgroup, buf, buflen); -} - /** * blkg_get - get a blkg reference * @blkg: blkg to get
@@ -736,7 +723,6 @@ static inline struct blkcg *bio_blkcg(struct bio *bio) { return NULL; } static inline struct blkg_policy_data *blkg_to_pd(struct blkcg_gq *blkg, struct blkcg_policy *pol) { return NULL; } static inline struct blkcg_gq *pd_to_blkg(struct blkg_policy_data *pd) { return NULL; } -static inline char *blkg_path(struct blkcg_gq *blkg) { return NULL; } static inline void blkg_get(struct blkcg_gq *blkg) { } static inline void blkg_put(struct blkcg_gq *blkg) { }
--
2.26.2