cgroups: remove pointless NULL checks

We're already ensuring before that conf isn't NULL.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index c06f2ef9ae42adf235f587c4c72a14a47119f5c7..7e39a8fd7fabf14c20875de6dc58640869fb7626 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/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