Skip to content

Commit

Permalink
conf: don't pass struct lxc_conf
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Feb 26, 2021
1 parent dfaa5d9 commit db37aef
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/lxc/conf.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -3381,7 +3379,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");

Expand Down

0 comments on commit db37aef

Please sign in to comment.