X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fumount.c;h=2ae8f86ecd103cc98ff01dee344343a2f7a5c1f7;hp=28cfd7e7cd7b5b2fdf41c1b665de99c0a34b841b;hb=761163046260b42c0bed075c17d43e0e6c3dd3a4;hpb=d48141ba0bed2866e05261cf06f0a6adfb11f349 diff --git a/src/umount.c b/src/umount.c index 28cfd7e7c..2ae8f86ec 100644 --- a/src/umount.c +++ b/src/umount.c @@ -36,44 +36,41 @@ typedef struct MountPoint { char *path; + dev_t devnum; LIST_FIELDS (struct MountPoint, mount_point); } MountPoint; -/* Takes over possession of path */ -static MountPoint *mount_point_alloc(char *path) { - MountPoint *mp; +static void mount_point_free(MountPoint **head, MountPoint *m) { + assert(head); + assert(m); - if (!(mp = new(MountPoint, 1))) - return NULL; + LIST_REMOVE(MountPoint, mount_point, *head, m); - mp->path = path; - return mp; + free(m->path); + free(m); } -static void mount_point_remove_and_free(MountPoint *mount_point, MountPoint **mount_point_list_head) { - LIST_REMOVE(MountPoint, mount_point, *mount_point_list_head, mount_point); +static void mount_points_list_free(MountPoint **head) { + assert(head); - free(mount_point->path); - free(mount_point); + while (*head) + mount_point_free(head, *head); } -static void mount_points_list_free(MountPoint **mount_point_list_head) { - while (*mount_point_list_head) - mount_point_remove_and_free(*mount_point_list_head, mount_point_list_head); -} - -static int mount_points_list_get(MountPoint **mount_point_list_head) { +static int mount_points_list_get(MountPoint **head) { FILE *proc_self_mountinfo; char *path, *p; unsigned int i; int r; + assert(head); + if (!(proc_self_mountinfo = fopen("/proc/self/mountinfo", "re"))) return -errno; for (i = 1;; i++) { int k; - MountPoint *mp; + MountPoint *m; path = p = NULL; @@ -108,18 +105,19 @@ static int mount_points_list_get(MountPoint **mount_point_list_head) { goto finish; } - if (mount_point_is_api(p)) { + if (mount_point_is_api(p) || mount_point_ignore(p)) { free(p); continue; } - if (!(mp = mount_point_alloc(p))) { + if (!(m = new0(MountPoint, 1))) { free(p); r = -ENOMEM; goto finish; } - LIST_PREPEND(MountPoint, mount_point, *mount_point_list_head, mp); + m->path = p; + LIST_PREPEND(MountPoint, mount_point, *head, m); } r = 0; @@ -130,11 +128,13 @@ finish: return r; } -static int swap_list_get(MountPoint **swap_list_head) { +static int swap_list_get(MountPoint **head) { FILE *proc_swaps; unsigned int i; int r; + assert(head); + if (!(proc_swaps = fopen("/proc/swaps", "re"))) return -errno; @@ -175,14 +175,14 @@ static int swap_list_get(MountPoint **swap_list_head) { goto finish; } - swap = mount_point_alloc(d); - if (!swap) { + if (!(swap = new0(MountPoint, 1))) { free(d); r = -ENOMEM; goto finish; } - LIST_PREPEND(MountPoint, mount_point, *swap_list_head, swap); + swap->path = d; + LIST_PREPEND(MountPoint, mount_point, *head, swap); } r = 0; @@ -193,12 +193,14 @@ finish: return r; } -static int loopback_list_get(MountPoint **loopback_list_head) { +static int loopback_list_get(MountPoint **head) { int r; struct udev *udev; struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; + assert(head); + if (!(udev = udev_new())) { r = -ENOMEM; goto finish; @@ -221,7 +223,6 @@ static int loopback_list_get(MountPoint **loopback_list_head) { } first = udev_enumerate_get_list_entry(e); - udev_list_entry_foreach(item, first) { MountPoint *lb; struct udev_device *d; @@ -233,24 +234,27 @@ static int loopback_list_get(MountPoint **loopback_list_head) { goto finish; } - if ((dn = udev_device_get_devnode(d))) { - loop = strdup(dn); + if (!(dn = udev_device_get_devnode(d))) { udev_device_unref(d); + continue; + } - if (!loop) { - r = -ENOMEM; - goto finish; - } - } else - udev_device_unref(d); + loop = strdup(dn); + udev_device_unref(d); + + if (!loop) { + r = -ENOMEM; + goto finish; + } - if (!(lb = mount_point_alloc(loop))) { + if (!(lb = new0(MountPoint, 1))) { free(loop); r = -ENOMEM; goto finish; } - LIST_PREPEND(MountPoint, mount_point, *loopback_list_head, lb); + lb->path = loop; + LIST_PREPEND(MountPoint, mount_point, *head, lb); } r = 0; @@ -265,12 +269,14 @@ finish: return r; } -static int dm_list_get(MountPoint **dm_list_head) { +static int dm_list_get(MountPoint **head) { int r; struct udev *udev; struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; + assert(head); + if (!(udev = udev_new())) { r = -ENOMEM; goto finish; @@ -295,43 +301,42 @@ static int dm_list_get(MountPoint **dm_list_head) { first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { - MountPoint *lb; + MountPoint *m; struct udev_device *d; - char *dm = NULL; - struct udev_list_entry *dlink = NULL, *first_dlink = NULL; + 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; } - first_dlink = udev_device_get_devlinks_list_entry(d); - udev_list_entry_foreach(dlink, first_dlink) { + devnum = udev_device_get_devnum(d); + dn = udev_device_get_devnode(d); - if (startswith(udev_list_entry_get_name(dlink), "/dev/mapper/")) { - - if (!(dm = strdup(udev_list_entry_get_name(dlink)))) { - udev_device_unref(d); - r = -ENOMEM; - goto finish; - } - - break; - } + if (major(devnum) == 0 || !dn) { + udev_device_unref(d); + continue; } + node = strdup(dn); udev_device_unref(d); - if (!dm) - continue; + if (!node) { + r = -ENOMEM; + goto finish; + } - if (!(lb = mount_point_alloc(dm))) { - free(dm); + if (!(m = new(MountPoint, 1))) { + free(node); r = -ENOMEM; goto finish; } - LIST_PREPEND(MountPoint, mount_point, *dm_list_head, lb); + m->path = node; + m->devnum = devnum; + LIST_PREPEND(MountPoint, mount_point, *head, m); } r = 0; @@ -355,18 +360,21 @@ static int delete_loopback(const char *device) { r = ioctl(fd, LOOP_CLR_FD, 0); close_nointr_nofail(fd); + if (r >= 0) + return 1; + /* ENXIO: not bound, so no error */ - return (r >= 0 || errno == ENXIO) ? 0 : -errno; + if (errno == ENXIO) + return 0; + + return -errno; } -static int delete_dm(const char *device) { +static int delete_dm(dev_t devnum) { int fd, r; struct dm_ioctl dm; - assert(device); - - if (!startswith(device, "/dev/mapper/")) - return -EIO; + assert(major(devnum) != 0); if ((fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC)) < 0) return -errno; @@ -377,8 +385,7 @@ static int delete_dm(const char *device) { dm.version[2] = DM_VERSION_PATCHLEVEL; dm.data_size = sizeof(dm); - - strncpy(dm.name, device + 12, sizeof(dm.name)); + dm.dev = devnum; r = ioctl(fd, DM_DEV_REMOVE, &dm); close_nointr_nofail(fd); @@ -386,92 +393,126 @@ static int delete_dm(const char *device) { return r >= 0 ? 0 : -errno; } -static int mount_points_list_umount(MountPoint **mount_point_list_head) { - MountPoint *mp, *mp_next; - int failed = 0; +static int mount_points_list_umount(MountPoint **head, bool *changed) { + MountPoint *m, *n; + int n_failed = 0; + + assert(head); - LIST_FOREACH_SAFE(mount_point, mp, mp_next, *mount_point_list_head) { - if (streq(mp->path, "/")) + LIST_FOREACH_SAFE(mount_point, m, n, *head) { + if (streq(m->path, "/")) { + n_failed++; continue; + } /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */ - if (umount2(mp->path, MNT_FORCE) == 0) - mount_point_remove_and_free(mp, mount_point_list_head); - else { - log_warning("Could not unmount %s: %m", mp->path); - failed++; + if (umount2(m->path, MNT_FORCE) == 0) { + if (changed) + *changed = true; + + mount_point_free(head, m); + } else { + log_warning("Could not unmount %s: %m", m->path); + n_failed++; } } - return failed; + return n_failed; } -static int mount_points_list_remount_read_only(MountPoint **mount_point_list_head) { - MountPoint *mp, *mp_next; - int failed = 0; +static int mount_points_list_remount_read_only(MountPoint **head, bool *changed) { + MountPoint *m, *n; + int n_failed = 0; + + assert(head); + + LIST_FOREACH_SAFE(mount_point, m, n, *head) { - LIST_FOREACH_SAFE(mount_point, mp, mp_next, *mount_point_list_head) { /* Trying to remount read-only */ - 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_warning("Could not remount as read-only %s: %m", mp->path); - failed++; + if (mount(NULL, m->path, NULL, MS_MGC_VAL|MS_REMOUNT|MS_RDONLY, NULL) == 0) { + if (changed) + *changed = true; + + mount_point_free(head, m); + } else { + log_warning("Could not remount as read-only %s: %m", m->path); + n_failed++; } } - return failed; + return n_failed; } -static int swap_points_list_off(MountPoint **swap_list_head) { - MountPoint *swap, *swap_next; - int failed = 0; +static int swap_points_list_off(MountPoint **head, bool *changed) { + MountPoint *m, *n; + int n_failed = 0; + + assert(head); + + LIST_FOREACH_SAFE(mount_point, m, n, *head) { + if (swapoff(m->path) == 0) { + if (changed) + *changed = true; - LIST_FOREACH_SAFE(mount_point, swap, swap_next, *swap_list_head) { - if (swapoff(swap->path) == 0) - mount_point_remove_and_free(swap, swap_list_head); - else { - log_warning("Could not deactivate swap %s: %m", swap->path); - failed++; + mount_point_free(head, m); + } else { + log_warning("Could not deactivate swap %s: %m", m->path); + n_failed++; } } - return failed; + return n_failed; } -static int loopback_points_list_detach(MountPoint **loopback_list_head) { - MountPoint *loopback, *loopback_next; - int failed = 0; +static int loopback_points_list_detach(MountPoint **head, bool *changed) { + MountPoint *m, *n; + int n_failed = 0; + + assert(head); + + LIST_FOREACH_SAFE(mount_point, m, n, *head) { + int r; + + if ((r = delete_loopback(m->path)) >= 0) { - LIST_FOREACH_SAFE(mount_point, loopback, loopback_next, *loopback_list_head) { - if (delete_loopback(loopback->path) == 0) - mount_point_remove_and_free(loopback, loopback_list_head); - else { - log_warning("Could not delete loopback %s: %m", loopback->path); - failed++; + if (r > 0 && changed) + *changed = true; + + mount_point_free(head, m); + } else { + log_warning("Could not delete loopback %s: %m", m->path); + n_failed++; } } - return failed; + return n_failed; } -static int dm_points_list_detach(MountPoint **dm_list_head) { - MountPoint *dm, *dm_next; - int failed = 0; +static int dm_points_list_detach(MountPoint **head, bool *changed) { + MountPoint *m, *n; + int n_failed = 0; + + assert(head); + + LIST_FOREACH_SAFE(mount_point, m, n, *head) { + int r; + + if ((r = delete_dm(m->devnum)) >= 0) { + + if (r > 0 && changed) + *changed = true; - LIST_FOREACH_SAFE(mount_point, dm, dm_next, *dm_list_head) { - if (delete_dm(dm->path) == 0) - mount_point_remove_and_free(dm, dm_list_head); - else { - log_warning("Could not delete dm %s: %m", dm->path); - failed++; + mount_point_free(head, m); + } else { + log_warning("Could not delete dm %s: %m", m->path); + n_failed++; } } - return failed; + return n_failed; } -int umount_all(void) { +int umount_all(bool *changed) { int r; LIST_HEAD(MountPoint, mp_list_head); @@ -481,11 +522,11 @@ int umount_all(void) { if (r < 0) goto end; - r = mount_points_list_umount(&mp_list_head); + r = mount_points_list_umount(&mp_list_head, changed); if (r <= 0) goto end; - r = mount_points_list_remount_read_only(&mp_list_head); + r = mount_points_list_remount_read_only(&mp_list_head, changed); end: mount_points_list_free(&mp_list_head); @@ -493,7 +534,7 @@ int umount_all(void) { return r; } -int swapoff_all(void) { +int swapoff_all(bool *changed) { int r; LIST_HEAD(MountPoint, swap_list_head); @@ -503,7 +544,7 @@ int swapoff_all(void) { if (r < 0) goto end; - r = swap_points_list_off(&swap_list_head); + r = swap_points_list_off(&swap_list_head, changed); end: mount_points_list_free(&swap_list_head); @@ -511,7 +552,7 @@ int swapoff_all(void) { return r; } -int loopback_detach_all(void) { +int loopback_detach_all(bool *changed) { int r; LIST_HEAD(MountPoint, loopback_list_head); @@ -521,7 +562,7 @@ int loopback_detach_all(void) { if (r < 0) goto end; - r = loopback_points_list_detach(&loopback_list_head); + r = loopback_points_list_detach(&loopback_list_head, changed); end: mount_points_list_free(&loopback_list_head); @@ -529,7 +570,7 @@ int loopback_detach_all(void) { return r; } -int dm_detach_all(void) { +int dm_detach_all(bool *changed) { int r; LIST_HEAD(MountPoint, dm_list_head); @@ -539,7 +580,7 @@ int dm_detach_all(void) { if (r < 0) goto end; - r = dm_points_list_detach(&dm_list_head); + r = dm_points_list_detach(&dm_list_head, changed); end: mount_points_list_free(&dm_list_head);