From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 25 Apr 2021 09:02:15 +0000 (+0200)
Subject: conf: s/lxc_rootfs_prepare/lxc_rootfs_init/g
X-Git-Tag: lxc-5.0.0~190^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239f29c92d6809caaf6b7f53d57773ef1ba0a9ff;p=thirdparty%2Flxc.git

conf: s/lxc_rootfs_prepare/lxc_rootfs_init/g

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 44aa8ba4a..195fa4940 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -527,7 +527,7 @@ void lxc_storage_put(struct lxc_conf *conf)
  * no name pollution is happens.
  * don't unlink on NFS to avoid random named stale handles.
  */
-int lxc_rootfs_prepare(struct lxc_conf *conf, bool userns)
+int lxc_rootfs_init(struct lxc_conf *conf, bool userns)
 {
 	__do_close int dfd_path = -EBADF, fd_pin = -EBADF, fd_userns = -EBADF;
 	int ret;
diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 3a7879485..fe70f5bf4 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -505,6 +505,7 @@ __hidden extern void lxc_conf_free(struct lxc_conf *conf);
 __hidden extern int lxc_storage_prepare(struct lxc_conf *conf);
 __hidden extern int lxc_rootfs_prepare(struct lxc_conf *conf, bool userns);
 __hidden extern void lxc_storage_put(struct lxc_conf *conf);
+__hidden extern int lxc_rootfs_init(struct lxc_conf *conf, bool userns);
 __hidden extern int lxc_map_ids(struct lxc_list *idmap, pid_t pid);
 __hidden extern int lxc_create_tty(const char *name, struct lxc_conf *conf);
 __hidden extern void lxc_delete_tty(struct lxc_tty_info *ttys);
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 070cae712..a18ac1bd2 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -2034,7 +2034,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
 	 * it readonly.
 	 * If the container is unprivileged then skip rootfs pinning.
 	 */
-	ret = lxc_rootfs_prepare(conf, !lxc_list_empty(&conf->id_map));
+	ret = lxc_rootfs_init(conf, !lxc_list_empty(&conf->id_map));
 	if (ret) {
 		ERROR("Failed to handle rootfs pinning for container \"%s\"", handler->name);
 		ret = -1;