X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcgroups.c;h=6d419722b7ef385ea0b8607f2b5b5056c849a408;hb=0657d95eaa686d64efe6bbccda346ebd6467bd0b;hp=a28f4e94d28ecaca3ed10e289b1293f023412b9b;hpb=c94e448d41d1852c2dd6ca4dc402ca6e225b5f37;p=collectd.git diff --git a/src/cgroups.c b/src/cgroups.c index a28f4e94..6d419722 100644 --- a/src/cgroups.c +++ b/src/cgroups.c @@ -144,7 +144,7 @@ static int read_cpuacct_procs (const char *dirname, char const *cgroup_name, /* * Gets called for every file/folder in /sys/fs/cgroup/cpu,cpuacct (or - * whereever cpuacct is mounted on the system). Calls walk_directory with the + * wherever cpuacct is mounted on the system). Calls walk_directory with the * read_cpuacct_procs callback on every folder it finds, such as "system". */ static int read_cpuacct_root (const char *dirname, const char *filename, @@ -221,8 +221,9 @@ static int cgroups_read (void) { /* Find the cgroup mountpoint which contains the cpuacct * controller. */ - if (strcmp(mnt_ptr->type, "cgroup") != 0 || - !cu_mount_getoptionvalue(mnt_ptr->options, "cpuacct")) + if ((strcmp(mnt_ptr->type, "cgroup") != 0) + || !cu_mount_checkoption(mnt_ptr->options, + "cpuacct", /* full = */ 1)) continue; walk_directory (mnt_ptr->dir, read_cpuacct_root,