umount: simplify code for deactivating loop devices

[elogind.git] / src / umount.c

diff --git a/src/umount.c b/src/umount.c
index 468eb715d65bb142bc81cbb3fae07dfb8247fa0e..ff1296fc0f7a77cb125a58fd9bd4805d62850916 100644 (file)
--- a/src/umount.c
+++ b/src/umount.c
@@ -38,6 +38,7 @@ typedef struct MountPoint {
         LIST_FIELDS (struct MountPoint, mount_point);
 } MountPoint;
 
+/* Takes over possession of path */
 static MountPoint *mount_point_alloc(char *path) {
         MountPoint *mp;
 
@@ -98,23 +99,26 @@ static int mount_points_list_get(MountPoint **mount_point_list_head) {
                         continue;
                 }
 
-                if (mount_point_is_api(path)) {
-                        free(path);
-                        continue;
-                }
+                p = cunescape(path);
+                free(path);
 
-                if (!(p = cunescape(path))) {
+                if (!p) {
                         r = -ENOMEM;
                         goto finish;
                 }
 
+                if (mount_point_is_api(p)) {
+                        free(p);
+                        continue;
+                }
+
                 if (!(mp = mount_point_alloc(p))) {
+                        free(p);
                         r = -ENOMEM;
                         goto finish;
                 }
-                LIST_PREPEND(MountPoint, mount_point, *mount_point_list_head, mp);
 
-                free(path);
+                LIST_PREPEND(MountPoint, mount_point, *mount_point_list_head, mp);
         }
 
         r = 0;
@@ -122,8 +126,6 @@ static int mount_points_list_get(MountPoint **mount_point_list_head) {
 finish:
         fclose(proc_self_mountinfo);
 
-        free(path);
-
         return r;
 }
 
@@ -225,16 +227,27 @@ static int loopback_list_get(MountPoint **loopback_list_head) {
 
         udev_list_entry_foreach(item, first) {
                 MountPoint *lb;
+                struct udev_device *d;
                 char *loop;
+                const char *dn;
 
-                loop = cunescape(udev_list_entry_get_name(item));
-                if (!loop) {
+                if (!(d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)))) {
                         r = -ENOMEM;
                         goto finish;
                 }
 
-                lb = mount_point_alloc(loop);
-                if (!lb) {
+                if ((dn = udev_device_get_devnode(d))) {
+                        loop = strdup(dn);
+                        udev_device_unref(d);
+
+                        if (!loop) {
+                                r = -ENOMEM;
+                                goto finish;
+                        }
+                } else
+                        udev_device_unref(d);
+
+                if (!(lb = mount_point_alloc(loop))) {
                         free(loop);
                         r = -ENOMEM;
                         goto finish;
@@ -249,30 +262,23 @@ finish:
         if (e)
                 udev_enumerate_unref(e);
 
-        free(udev);
+        if (udev)
+                udev_unref(udev);
+
         return r;
 }
 
 static int delete_loopback(const char *device) {
         int fd, r;
 
-        if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0) {
-                if (errno == ENOENT) {
-                        log_debug("Loop device %s does not exist.", device);
-                        errno = 0;
-                        return 0;
-                }
+        if ((fd = open(device, O_RDONLY|O_CLOEXEC)) < 0)
                 return -errno;
-        }
 
-        ioctl(fd, LOOP_CLR_FD, 0);
-        r = errno;
+        r = ioctl(fd, LOOP_CLR_FD, 0);
         close_nointr_nofail(fd);
 
-        if (r == ENXIO) /* not bound, so no error */
-                r = 0;
-        errno = r;
-        return -errno;
+        /* ENXIO: not bound, so no error */
+        return (r >= 0 || errno == ENXIO) ? 0 : -errno;
 }
 
 static int mount_points_list_umount(MountPoint **mount_point_list_head) {