diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 3f96f64dad..61814efa9c 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -4858,7 +4858,6 @@ static int unit_get_io_accounting_raw( int unit_get_io_accounting( Unit *u, CGroupIOAccountingMetric metric, - bool allow_cache, uint64_t *ret) { uint64_t raw[_CGROUP_IO_ACCOUNTING_METRIC_MAX]; @@ -4873,9 +4872,6 @@ int unit_get_io_accounting( if (!crt) return -ENODATA; - if (allow_cache && crt->io_accounting_last[metric] != UINT64_MAX) - goto done; - r = unit_get_io_accounting_raw(u, crt, raw); if (r == -ENODATA && crt->io_accounting_last[metric] != UINT64_MAX) goto done; diff --git a/src/core/cgroup.h b/src/core/cgroup.h index 1c5c1f75ab..7525da728e 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.h @@ -481,7 +481,7 @@ int unit_get_memory_current(Unit *u, uint64_t *ret); int unit_get_memory_accounting(Unit *u, CGroupMemoryAccountingMetric metric, uint64_t *ret); int unit_get_tasks_current(Unit *u, uint64_t *ret); int unit_get_cpu_usage(Unit *u, nsec_t *ret); -int unit_get_io_accounting(Unit *u, CGroupIOAccountingMetric metric, bool allow_cache, uint64_t *ret); +int unit_get_io_accounting(Unit *u, CGroupIOAccountingMetric metric, uint64_t *ret); int unit_get_ip_accounting(Unit *u, CGroupIPAccountingMetric metric, uint64_t *ret); int unit_get_effective_limit(Unit *u, CGroupLimitType type, uint64_t *ret); diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index d7869f115a..2db473fbed 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -1456,7 +1456,7 @@ static int property_get_io_counter( assert(property); assert_se((metric = cgroup_io_accounting_metric_from_string(property)) >= 0); - (void) unit_get_io_accounting(u, metric, /* allow_cache= */ false, &value); + (void) unit_get_io_accounting(u, metric, &value); return sd_bus_message_append(reply, "t", value); } diff --git a/src/core/unit.c b/src/core/unit.c index cebae4d53e..ae3cefcdde 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2385,7 +2385,7 @@ static int unit_log_resources(Unit *u) { assert(io_fields[k].journal_field); - (void) unit_get_io_accounting(u, k, k > 0, &value); + (void) unit_get_io_accounting(u, k, &value); if (value == UINT64_MAX) continue;