chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: add the missing setting of variable's value
[elogind.git]
/
src
/
core
/
umount.c
diff --git
a/src/core/umount.c
b/src/core/umount.c
index fd90d9f4048bbda7fa83e2918448a32684f073d2..1e95ad70dd0beb85394c23fab0b6e25f9075ee7e 100644
(file)
--- a/
src/core/umount.c
+++ b/
src/core/umount.c
@@
-219,7
+219,8
@@
static int loopback_list_get(MountPoint **head) {
}
if (udev_enumerate_add_match_subsystem(e, "block") < 0 ||
}
if (udev_enumerate_add_match_subsystem(e, "block") < 0 ||
- udev_enumerate_add_match_sysname(e, "loop*") < 0) {
+ udev_enumerate_add_match_sysname(e, "loop*") < 0 ||
+ udev_enumerate_add_match_sysattr(e, "loop/backing_file", NULL) < 0) {
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-378,25
+379,23
@@
static int delete_loopback(const char *device) {
}
static int delete_dm(dev_t devnum) {
}
static int delete_dm(dev_t devnum) {
- int fd, r;
- struct dm_ioctl dm;
+ _cleanup_close_ int fd = -1;
+ int r;
+ struct dm_ioctl dm = {
+ .version = {DM_VERSION_MAJOR,
+ DM_VERSION_MINOR,
+ DM_VERSION_PATCHLEVEL},
+ .data_size = sizeof(dm),
+ .dev = devnum,
+ };
assert(major(devnum) != 0);
assert(major(devnum) != 0);
- if ((fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC)) < 0)
+ fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC);
+ if (fd < 0)
return -errno;
return -errno;
- zero(dm);
- dm.version[0] = DM_VERSION_MAJOR;
- dm.version[1] = DM_VERSION_MINOR;
- dm.version[2] = DM_VERSION_PATCHLEVEL;
-
- dm.data_size = sizeof(dm);
- dm.dev = devnum;
-
r = ioctl(fd, DM_DEV_REMOVE, &dm);
r = ioctl(fd, DM_DEV_REMOVE, &dm);
- close_nointr_nofail(fd);
-
return r >= 0 ? 0 : -errno;
}
return r >= 0 ? 0 : -errno;
}
@@
-419,7
+418,7
@@
static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
*
* Mount points can be stacked. If a mount
* point is stacked below / or /usr, we
*
* Mount points can be stacked. If a mount
* point is stacked below / or /usr, we
- * cann
n
ot umount or remount it directly,
+ * cannot umount or remount it directly,
* since there is no way to refer to the
* underlying mount. There's nothing we can do
* about it for the general case, but we can
* since there is no way to refer to the
* underlying mount. There's nothing we can do
* about it for the general case, but we can
@@
-442,9
+441,11
@@
static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
)
continue;
)
continue;
- /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
+ /* Trying to umount. We don't force here since we rely
+ * on busy NFS and FUSE file systems to return EBUSY
+ * until we closed everything on top of them. */
log_info("Unmounting %s.", m->path);
log_info("Unmounting %s.", m->path);
- if (umount2(m->path,
MNT_FORCE
) == 0) {
+ if (umount2(m->path,
0
) == 0) {
if (changed)
*changed = true;
if (changed)
*changed = true;
@@
-465,7
+466,7
@@
static int swap_points_list_off(MountPoint **head, bool *changed) {
assert(head);
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
assert(head);
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
- log_info("D
isabl
ing swap %s.", m->path);
+ log_info("D
eactivat
ing swap %s.", m->path);
if (swapoff(m->path) == 0) {
if (changed)
*changed = true;
if (swapoff(m->path) == 0) {
if (changed)
*changed = true;
@@
-501,7
+502,7
@@
static int loopback_points_list_detach(MountPoint **head, bool *changed) {
continue;
}
continue;
}
- log_info("De
let
ing loopback %s.", m->path);
+ log_info("De
tach
ing loopback %s.", m->path);
r = delete_loopback(m->path);
if (r >= 0) {
if (r > 0 && changed)
r = delete_loopback(m->path);
if (r >= 0) {
if (r > 0 && changed)
@@
-509,7
+510,7
@@
static int loopback_points_list_detach(MountPoint **head, bool *changed) {
mount_point_free(head, m);
} else {
mount_point_free(head, m);
} else {
- log_warning("Could not de
lete
loopback %s: %m", m->path);
+ log_warning("Could not de
tach
loopback %s: %m", m->path);
n_failed++;
}
}
n_failed++;
}
}
@@
-536,7
+537,7
@@
static int dm_points_list_detach(MountPoint **head, bool *changed) {
continue;
}
continue;
}
- log_info("De
let
ing DM %u:%u.", major(m->devnum), minor(m->devnum));
+ log_info("De
tach
ing DM %u:%u.", major(m->devnum), minor(m->devnum));
r = delete_dm(m->devnum);
if (r >= 0) {
if (changed)
r = delete_dm(m->devnum);
if (r >= 0) {
if (changed)
@@
-544,7
+545,7
@@
static int dm_points_list_detach(MountPoint **head, bool *changed) {
mount_point_free(head, m);
} else {
mount_point_free(head, m);
} else {
- log_warning("Could not de
lete
DM %s: %m", m->path);
+ log_warning("Could not de
tach
DM %s: %m", m->path);
n_failed++;
}
}
n_failed++;
}
}