shared/utf8: merge implementations, remove cruft

[elogind.git] / src / shared / cgroup-label.c

diff --git a/src/shared/cgroup-label.c b/src/shared/cgroup-label.c
index a0b486e51ef8dab8fb83ff09e3eba016a8bc8960..bae0a627d24293cf785446f197632cd7a8c43b6a 100644 (file)
--- a/src/shared/cgroup-label.c
+++ b/src/shared/cgroup-label.c
@@ -36,18 +36,18 @@
 #include "util.h"
 #include "mkdir.h"
 
-int cg_create(const char *controller, const char *path, const char *suffix) {
+/* This is split out since it needs label calls, either directly or
+ * indirectly. */
+
+int cg_create(const char *controller, const char *path) {
         _cleanup_free_ char *fs = NULL;
         int r;
 
-        assert(controller);
-        assert(path);
-
-        r = cg_get_path_and_check(controller, path, suffix, &fs);
+        r = cg_get_path_and_check(controller, path, NULL, &fs);
         if (r < 0)
                 return r;
 
-        r = mkdir_parents_label(fs, 0755);
+        r = mkdir_parents_prefix_label("/sys/fs/cgroup", fs, 0755);
         if (r < 0)
                 return r;
 
@@ -65,11 +65,9 @@ int cg_create(const char *controller, const char *path, const char *suffix) {
 int cg_create_and_attach(const char *controller, const char *path, pid_t pid) {
         int r, q;
 
-        assert(controller);
-        assert(path);
         assert(pid >= 0);
 
-        r = cg_create(controller, path, NULL);
+        r = cg_create(controller, path);
         if (r < 0)
                 return r;