| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869 |
- From 3607849df47822151b05df440759e2dc70160755 Mon Sep 17 00:00:00 2001
- From: Wolfgang Bumiller <[email protected]>
- Date: Tue, 11 Jan 2022 09:31:59 +0100
- Subject: blk-cgroup: always terminate io.stat lines
- With the removal of seq_get_buf in blkcg_print_one_stat, we
- cannot make adding the newline conditional on there being
- relevant stats because the name was already written out
- unconditionally.
- Otherwise we may end up with multiple device names in one
- line which is confusing and doesn't follow the nested-keyed
- file format.
- Signed-off-by: Wolfgang Bumiller <[email protected]>
- Fixes: 252c651a4c85 ("blk-cgroup: stop using seq_get_buf")
- Acked-by: Tejun Heo <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Jens Axboe <[email protected]>
- ---
- block/blk-cgroup.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
- (limited to 'block/blk-cgroup.c')
- diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
- index a91f8ae18b49b..204442fad33cf 100644
- --- a/block/blk-cgroup.c
- +++ b/block/blk-cgroup.c
- @@ -949,7 +949,6 @@ static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)
- {
- struct blkg_iostat_set *bis = &blkg->iostat;
- u64 rbytes, wbytes, rios, wios, dbytes, dios;
- - bool has_stats = false;
- const char *dname;
- unsigned seq;
- int i;
- @@ -975,14 +974,12 @@ static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)
- } while (u64_stats_fetch_retry(&bis->sync, seq));
-
- if (rbytes || wbytes || rios || wios) {
- - has_stats = true;
- seq_printf(s, "rbytes=%llu wbytes=%llu rios=%llu wios=%llu dbytes=%llu dios=%llu",
- rbytes, wbytes, rios, wios,
- dbytes, dios);
- }
-
- if (blkcg_debug_stats && atomic_read(&blkg->use_delay)) {
- - has_stats = true;
- seq_printf(s, " use_delay=%d delay_nsec=%llu",
- atomic_read(&blkg->use_delay),
- atomic64_read(&blkg->delay_nsec));
- @@ -994,12 +991,10 @@ static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)
- if (!blkg->pd[i] || !pol->pd_stat_fn)
- continue;
-
- - if (pol->pd_stat_fn(blkg->pd[i], s))
- - has_stats = true;
- + pol->pd_stat_fn(blkg->pd[i], s);
- }
-
- - if (has_stats)
- - seq_printf(s, "\n");
- + seq_puts(s, "\n");
- }
-
- static int blkcg_print_stat(struct seq_file *sf, void *v)
- --
- cgit
|
