From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 14 May 2025 16:36:16 +0000 (+0200)
Subject: core: drop Manager.blockio_accounting
X-Git-Tag: v258-rc1~595^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3274ef6792c45c2fba22bdf74cac9e2c0795407c;p=thirdparty%2Fsystemd.git

core: drop Manager.blockio_accounting

Follow-up for 98d64ff5004b497a853e9058217c6eff46065fdb
---

diff --git a/src/core/manager-varlink.c b/src/core/manager-varlink.c
index c124b2fc9fc..bbf2368d56d 100644
--- a/src/core/manager-varlink.c
+++ b/src/core/manager-varlink.c
@@ -59,7 +59,6 @@ static int manager_context_build_json(sd_json_variant **ret, const char *name, v
                         JSON_BUILD_PAIR_FINITE_USEC("DefaultRestartUSec", m->defaults.restart_usec),
                         JSON_BUILD_PAIR_RATELIMIT("DefaultStartLimit", &m->defaults.start_limit),
                         SD_JSON_BUILD_PAIR_BOOLEAN("DefaultCPUAccounting", m->defaults.cpu_accounting),
-                        SD_JSON_BUILD_PAIR_BOOLEAN("DefaultBlockIOAccounting", m->defaults.blockio_accounting),
                         SD_JSON_BUILD_PAIR_BOOLEAN("DefaultIOAccounting", m->defaults.io_accounting),
                         SD_JSON_BUILD_PAIR_BOOLEAN("DefaultIPAccounting", m->defaults.ip_accounting),
                         SD_JSON_BUILD_PAIR_BOOLEAN("DefaultMemoryAccounting", m->defaults.memory_accounting),
diff --git a/src/core/manager.c b/src/core/manager.c
index 1000818c7a8..8e75727bfdd 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4200,7 +4200,6 @@ int manager_set_unit_defaults(Manager *m, const UnitDefaults *defaults) {
         m->defaults.cpu_accounting = defaults->cpu_accounting;
         m->defaults.memory_accounting = defaults->memory_accounting;
         m->defaults.io_accounting = defaults->io_accounting;
-        m->defaults.blockio_accounting = defaults->blockio_accounting;
         m->defaults.tasks_accounting = defaults->tasks_accounting;
         m->defaults.ip_accounting = defaults->ip_accounting;
 
@@ -5101,7 +5100,6 @@ void unit_defaults_init(UnitDefaults *defaults, RuntimeScope scope) {
                 .cpu_accounting = cpu_accounting_is_cheap(),
                 .memory_accounting = MEMORY_ACCOUNTING_DEFAULT,
                 .io_accounting = false,
-                .blockio_accounting = false,
                 .tasks_accounting = true,
                 .ip_accounting = false,
 
diff --git a/src/core/manager.h b/src/core/manager.h
index 27783d06bb7..1c3eefd141d 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -152,7 +152,6 @@ typedef struct UnitDefaults {
         bool cpu_accounting;
         bool memory_accounting;
         bool io_accounting;
-        bool blockio_accounting;
         bool tasks_accounting;
         bool ip_accounting;
 
diff --git a/src/shared/varlink-io.systemd.Manager.c b/src/shared/varlink-io.systemd.Manager.c
index bc6a6077460..513ccb68f8c 100644
--- a/src/shared/varlink-io.systemd.Manager.c
+++ b/src/shared/varlink-io.systemd.Manager.c
@@ -55,8 +55,6 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_DEFINE_FIELD_BY_TYPE(DefaultStartLimit, RateLimit, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("https://www.freedesktop.org/software/systemd/man/"PROJECT_VERSION_STR"/systemd-system.conf.html#DefaultCPUAccounting="),
                 SD_VARLINK_DEFINE_FIELD(DefaultCPUAccounting, SD_VARLINK_BOOL, 0),
-                SD_VARLINK_FIELD_COMMENT("https://www.freedesktop.org/software/systemd/man/"PROJECT_VERSION_STR"/systemd-system.conf.html#DefaultBlockIOAccounting="),
-                SD_VARLINK_DEFINE_FIELD(DefaultBlockIOAccounting, SD_VARLINK_BOOL, 0),
                 SD_VARLINK_FIELD_COMMENT("https://www.freedesktop.org/software/systemd/man/"PROJECT_VERSION_STR"/systemd-system.conf.html#DefaultIOAccounting="),
                 SD_VARLINK_DEFINE_FIELD(DefaultIOAccounting, SD_VARLINK_BOOL, 0),
                 SD_VARLINK_FIELD_COMMENT("https://www.freedesktop.org/software/systemd/man/"PROJECT_VERSION_STR"/systemd-system.conf.html#DefaultIPAccounting="),
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 1050c4f47da..ac70bad8ba6 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -55,7 +55,6 @@ TEST_RET(cgroup_mask, .sd_booted = true) {
          * else. */
         m->defaults.cpu_accounting =
                 m->defaults.memory_accounting =
-                m->defaults.blockio_accounting =
                 m->defaults.io_accounting =
                 m->defaults.tasks_accounting = false;
         m->defaults.tasks_max = CGROUP_TASKS_MAX_UNSET;