Merge pull request #31367 from yuwata/cgroup-runtime-fix
core/cgroup: several follow-up about CGroupRuntime
This commit is contained in:
@@ -5266,9 +5266,6 @@ CGroupRuntime *cgroup_runtime_free(CGroupRuntime *crt) {
|
||||
set_free(crt->ip_bpf_custom_egress);
|
||||
set_free(crt->ip_bpf_custom_egress_installed);
|
||||
|
||||
fdset_free(crt->initial_socket_bind_link_fds);
|
||||
fdset_free(crt->initial_restric_ifaces_link_fds);
|
||||
|
||||
free(crt->cgroup_path);
|
||||
|
||||
return mfree(crt);
|
||||
|
||||
+1
-1
@@ -5813,7 +5813,7 @@ int unit_prepare_exec(Unit *u) {
|
||||
(void) unit_realize_cgroup(u);
|
||||
|
||||
CGroupRuntime *crt = unit_get_cgroup_runtime(u);
|
||||
if (crt->reset_accounting) {
|
||||
if (crt && crt->reset_accounting) {
|
||||
(void) unit_reset_accounting(u);
|
||||
crt->reset_accounting = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user