conf: don't pass struct lxc_conf

parent 8183f09e
......@@ -2220,8 +2220,7 @@ static inline void __auto_endmntent__(FILE **f)
#define __do_endmntent __attribute__((__cleanup__(__auto_endmntent__)))
static int setup_mount_fstab(const struct lxc_conf *conf,
struct lxc_rootfs *rootfs, const char *fstab,
static int setup_mount_fstab(struct lxc_rootfs *rootfs, const char *fstab,
const char *lxc_name, const char *lxc_path)
{
__do_endmntent FILE *f = NULL;
......@@ -2311,9 +2310,8 @@ FILE *make_anonymous_mount_file(struct lxc_list *mount,
}
static int setup_mount_entries(const struct lxc_conf *conf,
struct lxc_rootfs *rootfs,
struct lxc_list *mount, const char *lxc_name,
const char *lxc_path)
struct lxc_rootfs *rootfs, struct lxc_list *mount,
const char *lxc_name, const char *lxc_path)
{
__do_fclose FILE *f = NULL;
......@@ -3382,7 +3380,7 @@ int lxc_setup(struct lxc_handler *handler)
if (ret < 0)
return log_error(-1, "Failed to setup first automatic mounts");
ret = setup_mount_fstab(lxc_conf, &lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
ret = setup_mount_fstab(&lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
if (ret < 0)
return log_error(-1, "Failed to setup mounts");
......
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