chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v221: Some more cleanup and a few fixes
[elogind.git]
/
src
/
basic
/
cgroup-util.c
diff --git
a/src/basic/cgroup-util.c
b/src/basic/cgroup-util.c
index ba9eeb92165eea79522bffaa60bf681c28fac1eb..4d321e30b3e30d30fa5ecc54f8ebeb74c945d96c 100644
(file)
--- a/
src/basic/cgroup-util.c
+++ b/
src/basic/cgroup-util.c
@@
-748,7
+748,7
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
controller = normalize_controller(controller);
} else
controller = normalize_controller(controller);
} else
- controller =
SYSTEM
D_CGROUP_CONTROLLER;
+ controller =
ELOGIN
D_CGROUP_CONTROLLER;
fs = procfs_file_alloca(pid, "cgroup");
fs = procfs_file_alloca(pid, "cgroup");
@@
-1060,7
+1060,7
@@
int cg_mangle_path(const char *path, char **result) {
if (r < 0)
return r;
if (r < 0)
return r;
- return cg_get_path(c ? c :
SYSTEM
D_CGROUP_CONTROLLER, p ? p : "/", NULL, result);
+ return cg_get_path(c ? c :
ELOGIN
D_CGROUP_CONTROLLER, p ? p : "/", NULL, result);
}
int cg_get_root_path(char **path) {
}
int cg_get_root_path(char **path) {
@@
-1069,7
+1069,7
@@
int cg_get_root_path(char **path) {
assert(path);
assert(path);
- r = cg_pid_get_path(
SYSTEM
D_CGROUP_CONTROLLER, 1, &p);
+ r = cg_pid_get_path(
ELOGIN
D_CGROUP_CONTROLLER, 1, &p);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1117,7
+1117,7
@@
int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
assert(pid >= 0);
assert(cgroup);
assert(pid >= 0);
assert(cgroup);
- r = cg_pid_get_path(
SYSTEM
D_CGROUP_CONTROLLER, pid, &raw);
+ r = cg_pid_get_path(
ELOGIN
D_CGROUP_CONTROLLER, pid, &raw);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1754,7
+1754,7
@@
int cg_create_everywhere(CGroupControllerMask supported, CGroupControllerMask ma
* in all others */
/* First create the cgroup in our own hierarchy. */
* in all others */
/* First create the cgroup in our own hierarchy. */
- r = cg_create(
SYSTEM
D_CGROUP_CONTROLLER, path);
+ r = cg_create(
ELOGIN
D_CGROUP_CONTROLLER, path);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1776,7
+1776,7
@@
int cg_attach_everywhere(CGroupControllerMask supported, const char *path, pid_t
const char *n;
int r;
const char *n;
int r;
- r = cg_attach(
SYSTEM
D_CGROUP_CONTROLLER, path, pid);
+ r = cg_attach(
ELOGIN
D_CGROUP_CONTROLLER, path, pid);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1823,7
+1823,7
@@
int cg_migrate_everywhere(CGroupControllerMask supported, const char *from, cons
int r;
if (!path_equal(from, to)) {
int r;
if (!path_equal(from, to)) {
- r = cg_migrate_recursive(
SYSTEMD_CGROUP_CONTROLLER, from, SYSTEM
D_CGROUP_CONTROLLER, to, false, true);
+ r = cg_migrate_recursive(
ELOGIND_CGROUP_CONTROLLER, from, ELOGIN
D_CGROUP_CONTROLLER, to, false, true);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-1838,7
+1838,7
@@
int cg_migrate_everywhere(CGroupControllerMask supported, const char *from, cons
if (!p)
p = to;
if (!p)
p = to;
- cg_migrate_recursive_fallback(
SYSTEM
D_CGROUP_CONTROLLER, to, n, p, false, false);
+ cg_migrate_recursive_fallback(
ELOGIN
D_CGROUP_CONTROLLER, to, n, p, false, false);
}
bit <<= 1;
}
bit <<= 1;
@@
-1852,7
+1852,7
@@
int cg_trim_everywhere(CGroupControllerMask supported, const char *path, bool de
const char *n;
int r;
const char *n;
int r;
- r = cg_trim(
SYSTEM
D_CGROUP_CONTROLLER, path, delete_root);
+ r = cg_trim(
ELOGIN
D_CGROUP_CONTROLLER, path, delete_root);
if (r < 0)
return r;
if (r < 0)
return r;