conf: don't pass struct lxc_conf

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 421e5a06e031148f68aeb84b4e4c9b4a52db26e2..e0b37bd2109c7b661a443d2610d717009d0a3032 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -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");