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

conf: change some logs to print errno

Browse Source 
Signed-off-by: Donghwa Jeong <dh48.jeong@samsung.com>
This commit is contained in:
Donghwa Jeong 2018-06-05 14:43:48 +09:00
parent 2095b6d83a
commit fea3b91d09
No known key found for this signature in database
GPG Key ID: 0BE2750EE612F372
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/conf.c
View File

@ -3186,26 +3186,28 @@ void remount_all_slave(void)
char *line = NULL; char *line = NULL;
mntinfo_fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC); mntinfo_fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC);
if (mntinfo_fd < 0) if (mntinfo_fd < 0) {
SYSERROR("Failed to open \"/proc/self/mountinfo\"");
return; return;
}
memfd = memfd_create(".lxc_mountinfo", MFD_CLOEXEC); memfd = memfd_create(".lxc_mountinfo", MFD_CLOEXEC);
if (memfd < 0) { if (memfd < 0) {
char template[] = P_tmpdir "/.lxc_mountinfo_XXXXXX"; char template[] = P_tmpdir "/.lxc_mountinfo_XXXXXX";
if (errno != ENOSYS) { if (errno != ENOSYS) {
SYSERROR("Failed to create temporary in-memory file");
close(mntinfo_fd); close(mntinfo_fd);
WARN("Failed to create temporary in-memory file");
return; return;
} }
memfd = lxc_make_tmpfile(template, true); memfd = lxc_make_tmpfile(template, true);
}
if (memfd < 0) { if (memfd < 0) {
close(mntinfo_fd); close(mntinfo_fd);
WARN("Failed to create temporary file"); WARN("Failed to create temporary file");
return; return;
} }
}
#define __LXC_SENDFILE_MAX 0x7ffff000 /* maximum number of bytes sendfile can handle */ #define __LXC_SENDFILE_MAX 0x7ffff000 /* maximum number of bytes sendfile can handle */
again: again:
@ -3214,9 +3216,9 @@ again:
if (errno == EINTR) if (errno == EINTR)
goto again; goto again;
SYSERROR("Failed to copy \"/proc/self/mountinfo\"");
close(mntinfo_fd); close(mntinfo_fd);
close(memfd); close(memfd);
WARN("Failed to copy \"/proc/self/mountinfo\"");
return; return;
} }
close(mntinfo_fd); close(mntinfo_fd);
@ -3226,14 +3228,14 @@ again:
*/ */
ret = lseek(memfd, 0, SEEK_SET); ret = lseek(memfd, 0, SEEK_SET);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to reset file descriptor offset");
close(memfd); close(memfd);
WARN("%s - Failed to reset file descriptor offset", strerror(errno));
return; return;
} }
f = fdopen(memfd, "r"); f = fdopen(memfd, "r");
if (!f) { if (!f) {
WARN("Failed to open copy of \"/proc/self/mountinfo\" to mark " SYSERROR("Failed to open copy of \"/proc/self/mountinfo\" to mark "
"all shared. Continuing"); "all shared. Continuing");
close(memfd); close(memfd);
return; return;