clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-04 07:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

nspawn: log when tearing down of loop device fails

Browse Source
This commit is contained in:
Tom Gundersen
2014-09-29 20:52:10 +02:00
parent b1d6dcf5a5
commit e8c8ddccfc
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+10 -3
View File
@@ -2607,20 +2607,27 @@ static int mount_devices(
static void loop_remove(int nr, int *image_fd) {
_cleanup_close_ int control = -1;
int r;
if (nr < 0)
return;
if (image_fd && *image_fd >= 0) {
ioctl(*image_fd, LOOP_CLR_FD);
r = ioctl(*image_fd, LOOP_CLR_FD);
if (r < 0)
log_warning("Failed to close loop image: %m");
*image_fd = safe_close(*image_fd);
}
control = open("/dev/loop-control", O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
if (control < 0)
if (control < 0) {
log_warning("Failed to open /dev/loop-control: %m");
return;
}
ioctl(control, LOOP_CTL_REMOVE, nr);
r = ioctl(control, LOOP_CTL_REMOVE, nr);
if (r < 0)
log_warning("Failed to remove loop %d: %m", nr);
}
static int spawn_getent(const char *database, const char *key, pid_t *rpid) {