From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 17 Feb 2021 08:04:03 +0000 (+0100)
Subject: cgroups: reorder function arguments
X-Git-Tag: lxc-5.0.0~281^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fec43278ec4da59cb9879bcba4ce92dea6f9a9c;p=thirdparty%2Flxc.git

cgroups: reorder function arguments

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 78854a180..8987c3eaa 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1101,7 +1101,7 @@ static int __cgroup_tree_create(int dfd_base, const char *path, mode_t mode,
 
 static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
 			       struct hierarchy *h, const char *cgroup_leaf,
-			       bool payload, const char *cgroup_limit_dir)
+			       const char *cgroup_limit_dir, bool payload)
 {
 	__do_close int fd_limit = -EBADF, fd_final = -EBADF;
 	__do_free char *path = NULL, *limit_path = NULL;
@@ -1354,7 +1354,7 @@ __cgfsng_ops static bool cgfsng_monitor_create(struct cgroup_ops *ops, struct lx
 		for (i = 0; ops->hierarchies[i]; i++) {
 			if (cgroup_tree_create(ops, handler->conf,
 					       ops->hierarchies[i],
-					       monitor_cgroup, false, NULL))
+					       monitor_cgroup, NULL, false))
 				continue;
 
 			DEBUG("Failed to create cgroup \"%s\"", maybe_empty(ops->hierarchies[i]->monitor_full_path));
@@ -1450,8 +1450,9 @@ __cgfsng_ops static bool cgfsng_payload_create(struct cgroup_ops *ops, struct lx
 		for (i = 0; ops->hierarchies[i]; i++) {
 			if (cgroup_tree_create(ops, handler->conf,
 					       ops->hierarchies[i],
-					       container_cgroup, true,
-					       limiting_cgroup))
+					       container_cgroup,
+					       limiting_cgroup,
+					       true))
 				continue;
 
 			DEBUG("Failed to create cgroup \"%s\"", ops->hierarchies[i]->container_full_path ?: "(null)");