X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fumount.c;h=d1258f0f08b299244f3635e38fa536c4598fbebd;hp=877680764d658a8eb62b5c608c28e3efd7edad99;hb=03e334a1c7dc8c20c38902aa039440763acc9b17;hpb=c678406681d32d56730b9e9c002d5500d7aa7f8b diff --git a/src/core/umount.c b/src/core/umount.c index 877680764..d1258f0f0 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "list.h" #include "mount-setup.h" @@ -35,18 +34,20 @@ #include "path-util.h" #include "util.h" #include "virt.h" +#include "libudev.h" +#include "udev-util.h" typedef struct MountPoint { char *path; dev_t devnum; - LIST_FIELDS (struct MountPoint, mount_point); + LIST_FIELDS(struct MountPoint, mount_point); } MountPoint; static void mount_point_free(MountPoint **head, MountPoint *m) { assert(head); assert(m); - LIST_REMOVE(MountPoint, mount_point, *head, m); + LIST_REMOVE(mount_point, *head, m); free(m->path); free(m); @@ -124,7 +125,7 @@ static int mount_points_list_get(MountPoint **head) { } m->path = p; - LIST_PREPEND(MountPoint, mount_point, *head, m); + LIST_PREPEND(mount_point, *head, m); } r = 0; @@ -169,7 +170,7 @@ static int swap_list_get(MountPoint **head) { continue; } - if (endswith(dev, "(deleted)")) { + if (endswith(dev, " (deleted)")) { free(dev); continue; } @@ -189,7 +190,7 @@ static int swap_list_get(MountPoint **head) { } swap->path = d; - LIST_PREPEND(MountPoint, mount_point, *head, swap); + LIST_PREPEND(mount_point, *head, swap); } r = 0; @@ -201,172 +202,141 @@ finish: } static int loopback_list_get(MountPoint **head) { - int r; - struct udev *udev; - struct udev_enumerate *e = NULL; + _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; + _cleanup_udev_unref_ struct udev *udev = NULL; + int r; assert(head); - if (!(udev = udev_new())) { - r = -ENOMEM; - goto finish; - } + udev = udev_new(); + if (!udev) + return -ENOMEM; - if (!(e = udev_enumerate_new(udev))) { - r = -ENOMEM; - goto finish; - } + e = udev_enumerate_new(udev); + if (!e) + return -ENOMEM; - if (udev_enumerate_add_match_subsystem(e, "block") < 0 || - udev_enumerate_add_match_sysname(e, "loop*") < 0) { - r = -EIO; - goto finish; - } + r = udev_enumerate_add_match_subsystem(e, "block"); + if (r < 0) + return r; - if (udev_enumerate_scan_devices(e) < 0) { - r = -EIO; - goto finish; - } + r = udev_enumerate_add_match_sysname(e, "loop*"); + if (r < 0) + return r; + + r = udev_enumerate_add_match_sysattr(e, "loop/backing_file", NULL); + if (r < 0) + return r; + + r = udev_enumerate_scan_devices(e); + if (r < 0) + return r; first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { MountPoint *lb; - struct udev_device *d; + _cleanup_udev_device_unref_ struct udev_device *d; char *loop; const char *dn; - if (!(d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)))) { - r = -ENOMEM; - goto finish; - } + d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)); + if (!d) + return -ENOMEM; - if (!(dn = udev_device_get_devnode(d))) { - udev_device_unref(d); + dn = udev_device_get_devnode(d); + if (!dn) continue; - } loop = strdup(dn); - udev_device_unref(d); + if (!loop) + return -ENOMEM; - if (!loop) { - r = -ENOMEM; - goto finish; - } - - if (!(lb = new0(MountPoint, 1))) { + lb = new0(MountPoint, 1); + if (!lb) { free(loop); - r = -ENOMEM; - goto finish; + return -ENOMEM; } lb->path = loop; - LIST_PREPEND(MountPoint, mount_point, *head, lb); + LIST_PREPEND(mount_point, *head, lb); } - r = 0; - -finish: - if (e) - udev_enumerate_unref(e); - - if (udev) - udev_unref(udev); - - return r; + return 0; } static int dm_list_get(MountPoint **head) { - int r; - struct udev *udev; - struct udev_enumerate *e = NULL; + _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; + _cleanup_udev_unref_ struct udev *udev = NULL; + int r; assert(head); - if (!(udev = udev_new())) { - r = -ENOMEM; - goto finish; - } + udev = udev_new(); + if (!udev) + return -ENOMEM; - if (!(e = udev_enumerate_new(udev))) { - r = -ENOMEM; - goto finish; - } + e = udev_enumerate_new(udev); + if (!e) + return -ENOMEM; - if (udev_enumerate_add_match_subsystem(e, "block") < 0 || - udev_enumerate_add_match_sysname(e, "dm-*") < 0) { - r = -EIO; - goto finish; - } + r = udev_enumerate_add_match_subsystem(e, "block"); + if (r < 0) + return r; - if (udev_enumerate_scan_devices(e) < 0) { - r = -EIO; - goto finish; - } + r = udev_enumerate_add_match_sysname(e, "dm-*"); + if (r < 0) + return r; - first = udev_enumerate_get_list_entry(e); + r = udev_enumerate_scan_devices(e); + if (r < 0) + return r; + first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { MountPoint *m; - struct udev_device *d; + _cleanup_udev_device_unref_ struct udev_device *d; dev_t devnum; char *node; const char *dn; - if (!(d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)))) { - r = -ENOMEM; - goto finish; - } + d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)); + if (!d) + return -ENOMEM; devnum = udev_device_get_devnum(d); dn = udev_device_get_devnode(d); - - if (major(devnum) == 0 || !dn) { - udev_device_unref(d); + if (major(devnum) == 0 || !dn) continue; - } node = strdup(dn); - udev_device_unref(d); - - if (!node) { - r = -ENOMEM; - goto finish; - } + if (!node) + return -ENOMEM; - if (!(m = new(MountPoint, 1))) { + m = new(MountPoint, 1); + if (!m) { free(node); - r = -ENOMEM; - goto finish; + return -ENOMEM; } m->path = node; m->devnum = devnum; - LIST_PREPEND(MountPoint, mount_point, *head, m); + LIST_PREPEND(mount_point, *head, m); } - r = 0; - -finish: - if (e) - udev_enumerate_unref(e); - - if (udev) - udev_unref(udev); - - return r; + return 0; } static int delete_loopback(const char *device) { - int fd, r; + _cleanup_close_ int fd = -1; + int r; - if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0) + fd = open(device, O_RDONLY|O_CLOEXEC); + if (fd < 0) return errno == ENOENT ? 0 : -errno; r = ioctl(fd, LOOP_CLR_FD, 0); - close_nointr_nofail(fd); - if (r >= 0) return 1; @@ -378,25 +348,23 @@ static int delete_loopback(const char *device) { } 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); - 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; - 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); - close_nointr_nofail(fd); - return r >= 0 ? 0 : -errno; } @@ -419,7 +387,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 - * cannnot 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 @@ -442,9 +410,11 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e ) continue; - /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */ - if (umount2(m->path, MNT_FORCE) == 0) { - log_info("Unmounted %s.", m->path); + /* 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); + if (umount2(m->path, 0) == 0) { if (changed) *changed = true; @@ -465,6 +435,7 @@ static int swap_points_list_off(MountPoint **head, bool *changed) { assert(head); LIST_FOREACH_SAFE(mount_point, m, n, *head) { + log_info("Deactivating swap %s.", m->path); if (swapoff(m->path) == 0) { if (changed) *changed = true; @@ -500,14 +471,15 @@ static int loopback_points_list_detach(MountPoint **head, bool *changed) { continue; } - if ((r = delete_loopback(m->path)) >= 0) { - + log_info("Detaching loopback %s.", m->path); + r = delete_loopback(m->path); + if (r >= 0) { if (r > 0 && changed) *changed = true; mount_point_free(head, m); } else { - log_warning("Could not delete loopback %s: %m", m->path); + log_warning("Could not detach loopback %s: %m", m->path); n_failed++; } } @@ -534,14 +506,15 @@ static int dm_points_list_detach(MountPoint **head, bool *changed) { continue; } - if ((r = delete_dm(m->devnum)) >= 0) { - + log_info("Detaching DM %u:%u.", major(m->devnum), minor(m->devnum)); + r = delete_dm(m->devnum); + if (r >= 0) { if (changed) *changed = true; mount_point_free(head, m); } else { - log_warning("Could not delete dm %s: %m", m->path); + log_warning("Could not detach DM %s: %m", m->path); n_failed++; } } @@ -554,7 +527,7 @@ int umount_all(bool *changed) { bool umount_changed; LIST_HEAD(MountPoint, mp_list_head); - LIST_HEAD_INIT(MountPoint, mp_list_head); + LIST_HEAD_INIT(mp_list_head); r = mount_points_list_get(&mp_list_head); if (r < 0) goto end; @@ -584,7 +557,7 @@ int swapoff_all(bool *changed) { int r; LIST_HEAD(MountPoint, swap_list_head); - LIST_HEAD_INIT(MountPoint, swap_list_head); + LIST_HEAD_INIT(swap_list_head); r = swap_list_get(&swap_list_head); if (r < 0) @@ -602,7 +575,7 @@ int loopback_detach_all(bool *changed) { int r; LIST_HEAD(MountPoint, loopback_list_head); - LIST_HEAD_INIT(MountPoint, loopback_list_head); + LIST_HEAD_INIT(loopback_list_head); r = loopback_list_get(&loopback_list_head); if (r < 0) @@ -620,7 +593,7 @@ int dm_detach_all(bool *changed) { int r; LIST_HEAD(MountPoint, dm_list_head); - LIST_HEAD_INIT(MountPoint, dm_list_head); + LIST_HEAD_INIT(dm_list_head); r = dm_list_get(&dm_list_head); if (r < 0)