mirror of
https://git.proxmox.com/git/mirror_lxc
synced 2025-08-05 18:27:06 +00:00
Merge pull request #2653 from brauner/2018-09-27/minor_tweaks
cgroups: tweaks
This commit is contained in:
commit
2b35fa3003
@ -1376,8 +1376,10 @@ __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
|
|||||||
}
|
}
|
||||||
} while (ops->hierarchies[i] && idx > 0 && idx < 1000);
|
} while (ops->hierarchies[i] && idx > 0 && idx < 1000);
|
||||||
|
|
||||||
if (idx < 1000)
|
if (idx < 1000) {
|
||||||
bret = true;
|
bret = true;
|
||||||
|
INFO("The monitor process uses \"%s\" as cgroup", monitor_cgroup);
|
||||||
|
}
|
||||||
|
|
||||||
on_error:
|
on_error:
|
||||||
free(monitor_cgroup);
|
free(monitor_cgroup);
|
||||||
@ -1454,6 +1456,7 @@ again:
|
|||||||
}
|
}
|
||||||
|
|
||||||
ops->container_cgroup = container_cgroup;
|
ops->container_cgroup = container_cgroup;
|
||||||
|
INFO("The container uses \"%s\" as cgroup", container_cgroup);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ struct cgroup_ops {
|
|||||||
char *container_cgroup;
|
char *container_cgroup;
|
||||||
|
|
||||||
/* Static memory, do not free.*/
|
/* Static memory, do not free.*/
|
||||||
char *monitor_pattern;
|
const char *monitor_pattern;
|
||||||
|
|
||||||
/* @hierarchies
|
/* @hierarchies
|
||||||
* - A NULL-terminated array of struct hierarchy, one per legacy
|
* - A NULL-terminated array of struct hierarchy, one per legacy
|
||||||
|
Loading…
Reference in New Issue
Block a user