X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fumount.c;h=e38851dc125fbc51906712d499fbb85c7bf01713;hp=acfbbe5e03af540cbc292b46a221ab1e4e31ce0d;hb=4968105790c65af58d4ab42bffa2a4bedc0be8ee;hpb=ab06eef8101866dd1337c4759002f7360a9db416 diff --git a/src/core/umount.c b/src/core/umount.c index acfbbe5e0..e38851dc1 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); @@ -60,52 +61,46 @@ static void mount_points_list_free(MountPoint **head) { } static int mount_points_list_get(MountPoint **head) { - FILE *proc_self_mountinfo; - char *path, *p; + _cleanup_fclose_ FILE *proc_self_mountinfo = NULL; unsigned int i; - int r; assert(head); - if (!(proc_self_mountinfo = fopen("/proc/self/mountinfo", "re"))) + proc_self_mountinfo = fopen("/proc/self/mountinfo", "re"); + if (!proc_self_mountinfo) return -errno; for (i = 1;; i++) { - int k; + _cleanup_free_ char *path = NULL; + char *p = NULL; MountPoint *m; + int k; - path = p = NULL; - - if ((k = fscanf(proc_self_mountinfo, - "%*s " /* (1) mount id */ - "%*s " /* (2) parent id */ - "%*s " /* (3) major:minor */ - "%*s " /* (4) root */ - "%ms " /* (5) mount point */ - "%*s" /* (6) mount options */ - "%*[^-]" /* (7) optional fields */ - "- " /* (8) separator */ - "%*s " /* (9) file system type */ - "%*s" /* (10) mount source */ - "%*s" /* (11) mount options 2 */ - "%*[^\n]", /* some rubbish at the end */ - &path)) != 1) { + k = fscanf(proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ + "%*s " /* (4) root */ + "%ms " /* (5) mount point */ + "%*s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ + "%*s " /* (9) file system type */ + "%*s" /* (10) mount source */ + "%*s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ + &path); + if (k != 1) { if (k == EOF) break; log_warning("Failed to parse /proc/self/mountinfo:%u.", i); - - free(path); continue; } p = cunescape(path); - free(path); - - if (!p) { - r = -ENOMEM; - goto finish; - } + if (!p) + return -ENOMEM; /* Ignore mount points we can't unmount because they * are API or because we are keeping them open (like @@ -117,28 +112,22 @@ static int mount_points_list_get(MountPoint **head) { continue; } - if (!(m = new0(MountPoint, 1))) { + m = new0(MountPoint, 1); + if (!m) { free(p); - r = -ENOMEM; - goto finish; + return -ENOMEM; } m->path = p; - LIST_PREPEND(MountPoint, mount_point, *head, m); + LIST_PREPEND(mount_point, *head, m); } - r = 0; - -finish: - fclose(proc_self_mountinfo); - - return r; + return 0; } static int swap_list_get(MountPoint **head) { - FILE *proc_swaps; + _cleanup_fclose_ FILE *proc_swaps = NULL; unsigned int i; - int r; assert(head); @@ -169,7 +158,7 @@ static int swap_list_get(MountPoint **head) { continue; } - if (endswith(dev, "(deleted)")) { + if (endswith(dev, " (deleted)")) { free(dev); continue; } @@ -178,196 +167,157 @@ static int swap_list_get(MountPoint **head) { free(dev); if (!d) { - r = -ENOMEM; - goto finish; + return -ENOMEM; } if (!(swap = new0(MountPoint, 1))) { free(d); - r = -ENOMEM; - goto finish; + return -ENOMEM; } swap->path = d; - LIST_PREPEND(MountPoint, mount_point, *head, swap); + LIST_PREPEND(mount_point, *head, swap); } - r = 0; - -finish: - fclose(proc_swaps); - - return r; + return 0; } 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 || - udev_enumerate_add_match_sysattr(e, "loop/backing_file", NULL) < 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; @@ -379,7 +329,7 @@ static int delete_loopback(const char *device) { } static int delete_dm(dev_t devnum) { - int _cleanup_close_ fd = -1; + _cleanup_close_ int fd = -1; int r; struct dm_ioctl dm = { .version = {DM_VERSION_MAJOR, @@ -451,7 +401,7 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e mount_point_free(head, m); } else if (log_error) { - log_warning("Could not unmount %s: %m", m->path); + log_warning_errno(errno, "Could not unmount %s: %m", m->path); n_failed++; } } @@ -473,7 +423,7 @@ static int swap_points_list_off(MountPoint **head, bool *changed) { mount_point_free(head, m); } else { - log_warning("Could not deactivate swap %s: %m", m->path); + log_warning_errno(errno, "Could not deactivate swap %s: %m", m->path); n_failed++; } } @@ -510,7 +460,7 @@ static int loopback_points_list_detach(MountPoint **head, bool *changed) { mount_point_free(head, m); } else { - log_warning("Could not detach loopback %s: %m", m->path); + log_warning_errno(errno, "Could not detach loopback %s: %m", m->path); n_failed++; } } @@ -545,7 +495,7 @@ static int dm_points_list_detach(MountPoint **head, bool *changed) { mount_point_free(head, m); } else { - log_warning("Could not detach DM %s: %m", m->path); + log_warning_errno(errno, "Could not detach DM %s: %m", m->path); n_failed++; } } @@ -558,7 +508,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; @@ -588,7 +538,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) @@ -606,7 +556,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) @@ -624,7 +574,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)