static int delete_loopback(const char *device) {
int fd, r;
- if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0) {
- if (errno == ENOENT) {
- log_debug("Loop device %s does not exist.", device);
- errno = 0;
- return 0;
- }
+ if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0)
return -errno;
- }
- ioctl(fd, LOOP_CLR_FD, 0);
- r = errno;
+ r = ioctl(fd, LOOP_CLR_FD, 0);
close_nointr_nofail(fd);
- if (r == ENXIO) /* not bound, so no error */
- r = 0;
- errno = r;
- return -errno;
+ /* ENXIO: not bound, so no error */
+ return (r >= 0 || errno == ENXIO) ? 0 : -errno;
}
static int mount_points_list_umount(MountPoint **mount_point_list_head) {
if (umount2(mp->path, MNT_FORCE) == 0)
mount_point_remove_and_free(mp, mount_point_list_head);
else {
- log_debug("Could not unmount %s: %m", mp->path);
+ log_warning("Could not unmount %s: %m", mp->path);
failed++;
}
}
if (mount(NULL, mp->path, NULL, MS_MGC_VAL|MS_REMOUNT|MS_RDONLY, NULL) == 0)
mount_point_remove_and_free(mp, mount_point_list_head);
else {
- log_debug("Could not remount as read-only %s: %m", mp->path);
+ log_warning("Could not remount as read-only %s: %m", mp->path);
failed++;
}
}
if (swapoff(swap->path) == 0)
mount_point_remove_and_free(swap, swap_list_head);
else {
- log_debug("Could not swapoff %s: %m", swap->path);
+ log_warning("Could not deactivate swap %s: %m", swap->path);
failed++;
}
}
if (delete_loopback(loopback->path) == 0)
mount_point_remove_and_free(loopback, loopback_list_head);
else {
- log_debug("Could not delete loopback %s: %m", loopback->path);
+ log_warning("Could not delete loopback %s: %m", loopback->path);
failed++;
}
}