Skip to content

L
lxc
Unverified Commit bb6dbaf0 by Christian Brauner
Options

cgroups: remove pointless NULL checks

We're already ensuring before that conf isn't NULL. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 326bb02c
Showing with 4 additions and 4 deletions
src/lxc/cgroups/cgfsng.c
......@@ -1008,7 +1008,7 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
WARN("Failed to detach bpf program from cgroup");
#endif
if (handler->conf && !lxc_list_empty(&handler->conf->id_map)) {
if (!lxc_list_empty(&handler->conf->id_map)) {
struct generic_userns_exec_data wrap = {
.conf = handler->conf,
.container_cgroup = ops->container_cgroup,
......@@ -1069,13 +1069,13 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
goto try_lxc_rm_rf;
}
if (conf && conf->cgroup_meta.monitor_pivot_dir)
if (conf->cgroup_meta.monitor_pivot_dir)
pivot_path = must_make_path(h->mountpoint, h->container_base_path,
conf->cgroup_meta.monitor_pivot_dir, CGROUP_PIVOT, NULL);
else if (conf && conf->cgroup_meta.monitor_dir)
else if (conf->cgroup_meta.monitor_dir)
pivot_path = must_make_path(h->mountpoint, h->container_base_path,
conf->cgroup_meta.monitor_dir, CGROUP_PIVOT, NULL);
else if (conf && conf->cgroup_meta.dir)
else if (conf->cgroup_meta.dir)
pivot_path = must_make_path(h->mountpoint, h->container_base_path,
conf->cgroup_meta.dir, CGROUP_PIVOT, NULL);
else
......
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