From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Mon, 11 May 2020 02:05:55 +0000 (+0000)
Subject: api.c: Add cgroup version enumeration
X-Git-Tag: v2.0.rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aac9889;p=thirdparty%2Flibcgroup.git

api.c: Add cgroup version enumeration

This commit adds a cgroup version enumeration to the
cg_mount_table.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Acked-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/src/api.c b/src/api.c
index 3845352f..9cfb42aa 100644
--- a/src/api.c
+++ b/src/api.c
@@ -1085,6 +1085,7 @@ static int cgroup_process_v1_mnt(char *controllers[], struct mntent *ent,
 			ent->mnt_dir, FILENAME_MAX);
 		cg_mount_table[*mnt_tbl_idx].mount.path[FILENAME_MAX-1] =
 			'\0';
+		cg_mount_table[*mnt_tbl_idx].version = CGROUP_V1;
 		cg_mount_table[*mnt_tbl_idx].mount.next = NULL;
 		cgroup_dbg("Found cgroup option %s, count %d\n",
 			ent->mnt_opts, *mnt_tbl_idx);
diff --git a/src/libcgroup-internal.h b/src/libcgroup-internal.h
index e31df512..dc292c66 100644
--- a/src/libcgroup-internal.h
+++ b/src/libcgroup-internal.h
@@ -112,6 +112,11 @@ struct cg_mount_point {
 	struct cg_mount_point *next;
 };
 
+enum cg_version_t {
+	CGROUP_V1,
+	CGROUP_V2,
+};
+
 struct cg_mount_table_s {
 	/** Controller name. */
 	char name[FILENAME_MAX];
@@ -120,6 +125,7 @@ struct cg_mount_table_s {
 	 */
 	struct cg_mount_point mount;
 	int index;
+	enum cg_version_t version;
 };
 
 struct cgroup_rules_data {