picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

umount: when we fail to detach a loopback device, set the auto-clear flag 

We might get lucky and this cleans up things later on automatically for
us.
This commit is contained in:
Lennart Poettering 2019-12-20 18:37:24 +01:00
parent b877c3b06f
commit 4ca8072fd6
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/shutdown/umount.c
View File

@ -340,7 +340,30 @@ static int delete_loopback(const char *device) {
if (errno == ENXIO) /* Nothing bound, didn't do anything */
return 0;
return -errno;
if (errno != EBUSY)
return log_debug_errno(errno, "Failed to clear loopback device %s: %m", device);
if (ioctl(fd, LOOP_GET_STATUS64, &info) < 0) {
if (errno == ENXIO) /* What? Suddenly detached after all? That's fine by us then. */
return 1;
log_debug_errno(errno, "Failed to invoke LOOP_GET_STATUS64 on loopback device %s, ignoring: %m", device);
return -EBUSY; /* propagate original error */
}
if (FLAGS_SET(info.lo_flags, LO_FLAGS_AUTOCLEAR)) /* someone else already set LO_FLAGS_AUTOCLEAR for us? fine by us */
return -EBUSY; /* propagate original error */
info.lo_flags |= LO_FLAGS_AUTOCLEAR;
if (ioctl(fd, LOOP_SET_STATUS64, &info) < 0) {
if (errno == ENXIO) /* Suddenly detached after all? Fine by us */
return 1;
log_debug_errno(errno, "Failed to set LO_FLAGS_AUTOCLEAR flag for loop device %s, ignoring: %m", device);
} else
log_debug("Successfully set LO_FLAGS_AUTOCLEAR flag for loop device %s.", device);
return -EBUSY;
}
if (ioctl(fd, LOOP_GET_STATUS64, &info) < 0) {