Skip to content

L
lxc
Unverified Commit 2f62fb00 by Christian Brauner
Options

cgfsng: fix is_lxcfs() and is_cgroupfs()

Both functions advertise that they return true when strncmp() == 0 and false when strncmp() != 0 but so far they returned the exact opposite. Signed-off-by: 's avatarChristian Brauner <cbrauner@suse.de>
parent 9d206b25
Showing with 3 additions and 3 deletions
src/lxc/cgfsng.c
...@@ -438,7 +438,7 @@ static bool is_lxcfs(const char *line) ...@@ -438,7 +438,7 @@ static bool is_lxcfs(const char *line)
char *p = strstr(line, " - "); char *p = strstr(line, " - ");
if (!p) if (!p)
return false; return false;
return strncmp(p, " - fuse.lxcfs ", 14); return strncmp(p, " - fuse.lxcfs ", 14) == 0;
} }
/* /*
...@@ -488,7 +488,7 @@ static bool is_cgroupfs(char *line) ...@@ -488,7 +488,7 @@ static bool is_cgroupfs(char *line)
char *p = strstr(line, " - "); char *p = strstr(line, " - ");
if (!p) if (!p)
return false; return false;
return strncmp(p, " - cgroup ", 10); return strncmp(p, " - cgroup ", 10) == 0;
} }
/* Add a controller to our list of hierarchies */ /* Add a controller to our list of hierarchies */
...@@ -1350,7 +1350,7 @@ static bool cgfsng_mount(void *hdata, const char *root, int type) ...@@ -1350,7 +1350,7 @@ static bool cgfsng_mount(void *hdata, const char *root, int type)
free(controllerpath); free(controllerpath);
goto bad; goto bad;
} }
r = do_secondstage_mounts_if_needed(type, h, controllerpath, path2, r = do_secondstage_mounts_if_needed(type, h, controllerpath, path2,
d->container_cgroup); d->container_cgroup);
free(controllerpath); free(controllerpath);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment