conf: s/lxc_rootfs_prepare/lxc_rootfs_init/g

parent 16fca125
...@@ -527,7 +527,7 @@ void lxc_storage_put(struct lxc_conf *conf) ...@@ -527,7 +527,7 @@ void lxc_storage_put(struct lxc_conf *conf)
* no name pollution is happens. * no name pollution is happens.
* don't unlink on NFS to avoid random named stale handles. * 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; __do_close int dfd_path = -EBADF, fd_pin = -EBADF, fd_userns = -EBADF;
int ret; int ret;
......
...@@ -505,6 +505,7 @@ __hidden extern void lxc_conf_free(struct lxc_conf *conf); ...@@ -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_storage_prepare(struct lxc_conf *conf);
__hidden extern int lxc_rootfs_prepare(struct lxc_conf *conf, bool userns); __hidden extern int lxc_rootfs_prepare(struct lxc_conf *conf, bool userns);
__hidden extern void lxc_storage_put(struct lxc_conf *conf); __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_map_ids(struct lxc_list *idmap, pid_t pid);
__hidden extern int lxc_create_tty(const char *name, struct lxc_conf *conf); __hidden extern int lxc_create_tty(const char *name, struct lxc_conf *conf);
__hidden extern void lxc_delete_tty(struct lxc_tty_info *ttys); __hidden extern void lxc_delete_tty(struct lxc_tty_info *ttys);
......
...@@ -2034,7 +2034,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops, ...@@ -2034,7 +2034,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
* it readonly. * it readonly.
* If the container is unprivileged then skip rootfs pinning. * 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) { if (ret) {
ERROR("Failed to handle rootfs pinning for container \"%s\"", handler->name); ERROR("Failed to handle rootfs pinning for container \"%s\"", handler->name);
ret = -1; ret = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment