proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-08 13:24:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxccontainer: do_lxcapi_load_config()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-24 15:20:50 +01:00
parent e3246ab9c8
commit d03ab308a7
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lxc/lxccontainer.c
View File

@ -595,9 +595,10 @@ static bool load_config_locked(struct lxc_container *c, const char *fname)
static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file) static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file)
{ {
bool ret = false, need_disklock = false;
int lret; int lret;
const char *fname; const char *fname;
bool need_disklock = false, ret = false;
if (!c) if (!c)
return false; return false;
@ -606,10 +607,10 @@ static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file)
fname = alt_file; fname = alt_file;
if (!fname) if (!fname)
return false; return false;
/*
* If we're reading something other than the container's config, /* If we're reading something other than the container's config, we only
* we only need to lock the in-memory container. If loading the * need to lock the in-memory container. If loading the container's
* container's config file, take the disk lock. * config file, take the disk lock.
*/ */
if (strcmp(fname, c->configfile) == 0) if (strcmp(fname, c->configfile) == 0)
need_disklock = true; need_disklock = true;
@ -627,6 +628,7 @@ static bool do_lxcapi_load_config(struct lxc_container *c, const char *alt_file)
container_disk_unlock(c); container_disk_unlock(c);
else else
container_mem_unlock(c); container_mem_unlock(c);
return ret; return ret;
} }