Merge pull request #12074 from poettering/io-acct

expose IO stats on the bus and in "systemctl status" and "systemd-run --wait"

diff --cc src/core/cgroup.c
Simple merge

diff --cc src/core/cgroup.h
Simple merge

diff --cc src/run/run.c
Simple merge

diff --cc src/systemctl/systemctl.c
index 25621745b18427a052e7f065d56ad0af1a931639,cfcc4f6874a32407fd3c4a21794388cd35606b31..dd485338995bc3f81f7ee90de978c6a175270338
--- 1/src/systemctl/systemctl.c
--- 2/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@@ -4125,13 -4125,11 +4125,14 @@@ typedef struct UnitStatusInfo 
          uint64_t cpu_usage_nsec;
          uint64_t tasks_current;
          uint64_t tasks_max;
- 
          uint64_t ip_ingress_bytes;
          uint64_t ip_egress_bytes;
+         uint64_t io_read_bytes;
+         uint64_t io_write_bytes;
  
 +        uint64_t default_memory_min;
 +        uint64_t default_memory_low;
 +
          LIST_HEAD(ExecStatusInfo, exec);
  } UnitStatusInfo;