From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 2 Jun 2017 22:39:28 +0000 (+0200)
Subject: conf: non-functional changes
X-Git-Tag: lxc-2.1.0~106^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=339efad99eab950d0da3bd767e94f248b8453900;p=thirdparty%2Flxc.git

conf: non-functional changes

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index ef0693967..bfcd9d378 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3618,7 +3618,7 @@ int mapped_hostid(unsigned id, struct lxc_conf *conf, enum idtype idtype)
 	return -1;
 }
 
-int find_unmapped_nsuid(struct lxc_conf *conf, enum idtype idtype)
+int find_unmapped_nsid(struct lxc_conf *conf, enum idtype idtype)
 {
 	struct lxc_list *it;
 	struct id_map *map;
@@ -4684,7 +4684,7 @@ static int run_userns_fn(void *data)
 	return d->fn(d->arg);
 }
 
-static struct id_map *mapped_hostid_entry(unsigned id, struct lxc_conf *conf,
+static struct id_map *mapped_hostid_entry(struct lxc_conf *conf, unsigned id,
 					  enum idtype idtype)
 {
 	struct lxc_list *it;
diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index ff6747c0e..9033a1a53 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -469,7 +469,7 @@ extern int setup_resource_limits(struct lxc_list *limits, pid_t pid);
 
 extern void lxc_restore_phys_nics_to_netns(int netnsfd, struct lxc_conf *conf);
 
-extern int find_unmapped_nsuid(struct lxc_conf *conf, enum idtype idtype);
+extern int find_unmapped_nsid(struct lxc_conf *conf, enum idtype idtype);
 extern int mapped_hostid(unsigned id, struct lxc_conf *conf, enum idtype idtype);
 extern int chown_mapped_root(char *path, struct lxc_conf *conf);
 extern int ttys_shift_ids(struct lxc_conf *c);
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 984520249..f93fdfc95 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1220,7 +1220,7 @@ static bool create_run_template(struct lxc_container *c, char *tpath, bool need_
 			if (!n2)
 				exit(1);
 			if (hostid_mapped < 0) {
-				hostid_mapped = find_unmapped_nsuid(conf, ID_TYPE_UID);
+				hostid_mapped = find_unmapped_nsid(conf, ID_TYPE_UID);
 				n2[n2args++] = "-m";
 				if (hostid_mapped < 0) {
 					ERROR("Could not find free uid to map");
@@ -1244,7 +1244,7 @@ static bool create_run_template(struct lxc_container *c, char *tpath, bool need_
 			if (!n2)
 				exit(1);
 			if (hostgid_mapped < 0) {
-				hostgid_mapped = find_unmapped_nsuid(conf, ID_TYPE_GID);
+				hostgid_mapped = find_unmapped_nsid(conf, ID_TYPE_GID);
 				n2[n2args++] = "-m";
 				if (hostgid_mapped < 0) {
 					ERROR("Could not find free uid to map");