!2522 move CGROUP2_SUPER_MAGIC define to cgroup.c

From: @taotao-sauce Reviewed-by: @xuxuepeng Signed-off-by: @xuxuepeng
openeuler-mirror · Oct 26, 2024 · f9a85b7 · f9a85b7
2 parents 74d748a + d0bb2c0
commit f9a85b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/daemon/common/cgroup/cgroup.c b/src/daemon/common/cgroup/cgroup.c
@@ -36,6 +36,10 @@
 #define CGROUP_SUPER_MAGIC 0x27e0eb
 #endif
 
+#ifndef CGROUP2_SUPER_MAGIC
+#define CGROUP2_SUPER_MAGIC 0x63677270
+#endif
+
 static cgroup_ops g_cgroup_ops;
 
 static int get_cgroup_version_for_init(void)

diff --git a/src/daemon/common/cgroup/cgroup_v2.c b/src/daemon/common/cgroup/cgroup_v2.c
@@ -52,10 +52,6 @@
 #define CGROUP2_CPUSET_CPUS_EFFECTIVE_PATH CGROUP_MOUNTPOINT"/cpuset.cpus.effective"
 #define CGROUP2_CPUSET_MEMS_EFFECTIVE_PATH CGROUP_MOUNTPOINT"/cpuset.mems.effective"
 
-#ifndef CGROUP2_SUPER_MAGIC
-#define CGROUP2_SUPER_MAGIC 0x63677270
-#endif
-
 static int get_value_ull_v2(const char *content, const char *match, void *result)
 {
     uint64_t ull_result = 0;