debian/patches/pve/0013-cgroups-remove-unneeded-variables-from-cgroup_tree_c.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Stoiko Ivanov <s.ivanov@proxmox.com>
   3 Date: Tue, 20 Jul 2021 10:30:36 +0200
   4 Subject: [PATCH] cgroups: remove unneeded variables from cgroup_tree_create
   5
   6 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
   7 ---
   8  src/lxc/cgroups/cgfsng.c | 13 ++++---------
   9  1 file changed, 4 insertions(+), 9 deletions(-)
  10
  11 diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
  12 index e27baa625..35ba0fb9d 100644
  13 --- a/src/lxc/cgroups/cgfsng.c
  14 +++ b/src/lxc/cgroups/cgfsng.c
  15 @@ -779,7 +779,6 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
  16                                const char *cgroup_leaf, bool payload)
  17  {
  18         __do_close int fd_limit = -EBADF, fd_final = -EBADF;
  19 -       __do_free char *path = NULL, *limit_path = NULL;
  20         bool cpuset_v1 = false;
  21
  22         /*
  23 @@ -794,9 +793,8 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
  24                 if (fd_limit < 0)
  25                         return syserror_ret(false, "Failed to create limiting cgroup %d(%s)", h->dfd_base, cgroup_limit_dir);
  26
  27 -               limit_path = make_cgroup_path(h, h->at_base, cgroup_limit_dir, NULL);
  28 +               h->path_lim = make_cgroup_path(h, h->at_base, cgroup_limit_dir, NULL);
  29                 h->dfd_lim = move_fd(fd_limit);
  30 -               h->path_lim = move_ptr(limit_path);
  31
  32                 TRACE("Created limit cgroup %d->%d(%s)",
  33                       h->dfd_lim, h->dfd_base, cgroup_limit_dir);
  34 @@ -811,8 +809,6 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
  35                     !ops->setup_limits_legacy(ops, conf, true))
  36                         return log_error(false, "Failed to setup legacy device limits");
  37
  38 -               path = must_make_path(h->path_lim, cgroup_leaf, NULL);
  39 -
  40                 /*
  41                  * If we use a separate limit cgroup, the leaf cgroup, i.e. the
  42                  * cgroup the container actually resides in, is below fd_limit.
  43 @@ -827,11 +823,9 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
  44                         return syserror_ret(false, "Failed to create %s cgroup %d(%s)", payload ? "payload" : "monitor", h->dfd_base, cgroup_limit_dir);
  45                 }
  46                 h->dfd_con = move_fd(fd_final);
  47 -               h->path_con = move_ptr(path);
  48 +               h->path_con = must_make_path(h->path_lim, cgroup_leaf, NULL);
  49
  50         } else {
  51 -               path = make_cgroup_path(h, h->at_base, cgroup_limit_dir, NULL);
  52 -
  53                 fd_final = __cgroup_tree_create(h->dfd_base, cgroup_limit_dir, 0755, cpuset_v1, false);
  54                 if (fd_final < 0)
  55                         return syserror_ret(false, "Failed to create %s cgroup %d(%s)", payload ? "payload" : "monitor", h->dfd_base, cgroup_limit_dir);
  56 @@ -839,7 +833,8 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
  57                 if (payload) {
  58                         h->dfd_con = move_fd(fd_final);
  59                         h->dfd_lim = h->dfd_con;
  60 -                       h->path_con = move_ptr(path);
  61 +                       h->path_con = make_cgroup_path(h, h->at_base, cgroup_limit_dir, NULL);
  62 +
  63                         h->path_lim = h->path_con;
  64                 } else {
  65                         h->dfd_mon = move_fd(fd_final);