summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/magic.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2015-11-16 11:13:34 -0500
committerTejun Heo <tj@kernel.org>2015-11-16 11:13:34 -0500
commit67e9c74b8a873408c27ac9a8e4c1d1c8d72c93ff (patch)
tree9fc77bea69c53fd663a90b0bc9296e64d2768cf6 /include/uapi/linux/magic.h
parent34c06254ff82a815fdccdfae7517a06c9b768cee (diff)
downloadlinux-stable-67e9c74b8a873408c27ac9a8e4c1d1c8d72c93ff.tar.gz
linux-stable-67e9c74b8a873408c27ac9a8e4c1d1c8d72c93ff.tar.bz2
linux-stable-67e9c74b8a873408c27ac9a8e4c1d1c8d72c93ff.zip
cgroup: replace __DEVEL__sane_behavior with cgroup2 fs type
With major controllers - cpu, memory and io - shaping up for the unified hierarchy, cgroup2 is about ready to be, gradually, released into the wild. Replace __DEVEL__sane_behavior flag which was used to select the unified hierarchy with a separate filesystem type "cgroup2" so that unified hierarchy can be mounted as follows. mount -t cgroup2 none $MOUNT_POINT The cgroup2 fs has its own magic number - 0x63677270 ("cgrp"). v2: Assign a different magic number to cgroup2 fs. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Li Zefan <lizefan@huawei.com> Cc: Johannes Weiner <hannes@cmpxchg.org>
Diffstat (limited to 'include/uapi/linux/magic.h')
-rw-r--r--include/uapi/linux/magic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index accb036bbc9c..b283d56c1db9 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -54,6 +54,7 @@
#define SMB_SUPER_MAGIC 0x517B
#define CGROUP_SUPER_MAGIC 0x27e0eb
+#define CGROUP2_SUPER_MAGIC 0x63677270
#define STACK_END_MAGIC 0x57AC6E9D