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

lxccontainer: improve file locking

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-08-15 00:37:05 +02:00
parent 27f39efa5d
commit d1bc8d484c
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/lxccontainer.c
View File

@ -155,12 +155,13 @@ static int ongoing_create(struct lxc_container *c)
if (ret < 0 || (size_t)ret >= len) if (ret < 0 || (size_t)ret >= len)
return -1; return -1;
if (!file_exists(path)) fd = open(path, O_RDWR | O_CLOEXEC);
return 0; if (fd < 0) {
if (errno != ENOENT)
return -1;
fd = open(path, O_RDWR);
if (fd < 0)
return 0; return 0;
}
lk.l_type = F_WRLCK; lk.l_type = F_WRLCK;
lk.l_whence = SEEK_SET; lk.l_whence = SEEK_SET;
@ -170,8 +171,11 @@ static int ongoing_create(struct lxc_container *c)
lk.l_pid = 0; lk.l_pid = 0;
ret = fcntl(fd, F_OFD_GETLK, &lk); ret = fcntl(fd, F_OFD_GETLK, &lk);
if (ret < 0 && errno == EINVAL) if (ret < 0 && errno == EINVAL) {
ret = flock(fd, LOCK_EX | LOCK_NB); ret = flock(fd, LOCK_EX | LOCK_NB);
if (ret < 0 && errno == EWOULDBLOCK)
ret = 0;
}
close(fd); close(fd);
@ -198,7 +202,7 @@ static int create_partial(struct lxc_container *c)
if (ret < 0 || (size_t)ret >= len) if (ret < 0 || (size_t)ret >= len)
return -1; return -1;
fd = open(path, O_RDWR | O_CREAT | O_EXCL, 0755); fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0000);
if (fd < 0) if (fd < 0)
return -1; return -1;