From d7582ba91869e19936c76f4d63b803d82d8e1caf Mon Sep 17 00:00:00 2001
From: vegbir <[email protected]>
Date: Wed, 12 Jul 2023 08:53:42 +0000
Subject: [PATCH 10/15] lxcfs proc_diskstats_read func obtain data from blki

Signed-off-by: vegbir <[email protected]>
---
 src/cgroups/cgfsng.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/cgroups/cgfsng.c b/src/cgroups/cgfsng.c
index e2d9807..15b4539 100644
--- a/src/cgroups/cgfsng.c
+++ b/src/cgroups/cgfsng.c
@@ -767,7 +767,11 @@ static int cgfsng_get_io(struct cgroup_ops *ops, const char *cgroup,
 static int cgfsng_get_io_service_bytes(struct cgroup_ops *ops,
 				       const char *cgroup, char **value)
 {
-	return cgfsng_get_io(ops, cgroup, "blkio.io_service_bytes_recursive", value);
+	int ret;
+	ret = cgfsng_get_io(ops, cgroup, "blkio.throttle.io_service_bytes_recursive", value);
+	if (ret < 0)
+		return cgfsng_get_io(ops, cgroup, "blkio.throttle.io_service_bytes", value);
+	return ret;
 }
 
 static int cgfsng_get_io_service_time(struct cgroup_ops *ops,
@@ -779,7 +783,11 @@ static int cgfsng_get_io_service_time(struct cgroup_ops *ops,
 static int cgfsng_get_io_serviced(struct cgroup_ops *ops, const char *cgroup,
 				  char **value)
 {
-	return cgfsng_get_io(ops, cgroup, "blkio.io_serviced_recursive", value);
+	int ret;
+	ret = cgfsng_get_io(ops, cgroup, "blkio.throttle.io_serviced_recursive", value);
+	if (ret < 0)
+		return cgfsng_get_io(ops, cgroup, "blkio.throttle.io_serviced", value);
+	return ret;
 }
 
 static int cgfsng_get_io_merged(struct cgroup_ops *ops, const char *cgroup,
-- 
2.41.0