From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 7 Dec 2015 00:10:50 +0000 (+0100)
Subject: cgroup2: use new fstype for unified hierarchy
X-Git-Tag: v231.3~255
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=27e59415d0da0580569d6c48434ebc3c18c0d73c

cgroup2: use new fstype for unified hierarchy

Since Linux v4.4-rc1, __DEVEL__sane_behavior does not exist anymore and
is replaced by a new fstype "cgroup2".

With this patch, elogind no longer supports the old (unstable) way of
doing unified hierarchy with __DEVEL__sane_behavior and elogind now
requires Linux v4.4 for unified hierarchy.

Non-unified hierarchy is still the default and is unchanged by this
patch.

https://github.com/torvalds/linux/commit/67e9c74b8a873408c27ac9a8e4c1d1c8d72c93ff
---

diff --git a/src/basic/missing.h b/src/basic/missing.h
index f2bc828dd..ec390f4f9 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -519,6 +519,10 @@ struct btrfs_ioctl_quota_ctl_args {
 #define CGROUP_SUPER_MAGIC 0x27e0eb
 #endif
 
+#ifndef CGROUP2_SUPER_MAGIC
+#define CGROUP2_SUPER_MAGIC 0x63677270
+#endif
+
 #ifndef TMPFS_MAGIC
 #define TMPFS_MAGIC 0x01021994
 #endif