From: Wei Yang Date: Sat, 8 Jan 2022 00:38:16 +0000 (+0000) Subject: cgroup: rstat: use same convention to assign cgroup_base_stat X-Git-Tag: v5.18-rc1~159^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4148be7de0a3316edd1af45609d354cac0e6a021;p=thirdparty%2Fkernel%2Flinux.git cgroup: rstat: use same convention to assign cgroup_base_stat In function cgroup_base_stat_flush(), we update cgroup_base_stat by getting rstatc->bstat and adjust delta to related fields. There are two convention to assign cgroup_base_stat in this function: * rstat2 = rstat1 * rstat2.cputime = rstat1.cputime The second convention may make audience think just field "cputime" is updated, while cputime is the only field in cgroup_base_stat. Let's use the same convention to eliminate this confusion. Signed-off-by: Wei Yang Signed-off-by: Tejun Heo --- diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index 9d331ba44870a..0b32fa62e93c1 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -325,7 +325,7 @@ static void cgroup_base_stat_flush(struct cgroup *cgrp, int cpu) /* fetch the current per-cpu values */ do { seq = __u64_stats_fetch_begin(&rstatc->bsync); - cur.cputime = rstatc->bstat.cputime; + cur = rstatc->bstat; } while (__u64_stats_fetch_retry(&rstatc->bsync, seq)); /* propagate percpu delta to global */