chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
umount: simplify code for deactivating loop devices
[elogind.git]
/
src
/
umount.c
diff --git
a/src/umount.c
b/src/umount.c
index 79fbba73244e8b33d3d58620583e90f3132ba86e..ff1296fc0f7a77cb125a58fd9bd4805d62850916 100644
(file)
--- a/
src/umount.c
+++ b/
src/umount.c
@@
-227,16
+227,27
@@
static int loopback_list_get(MountPoint **loopback_list_head) {
udev_list_entry_foreach(item, first) {
MountPoint *lb;
udev_list_entry_foreach(item, first) {
MountPoint *lb;
+ struct udev_device *d;
char *loop;
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;
}
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;
free(loop);
r = -ENOMEM;
goto finish;
@@
-251,30
+262,23
@@
finish:
if (e)
udev_enumerate_unref(e);
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;
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;
return -errno;
- }
- ioctl(fd, LOOP_CLR_FD, 0);
- r = errno;
+ r = ioctl(fd, LOOP_CLR_FD, 0);
close_nointr_nofail(fd);
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) {
}
static int mount_points_list_umount(MountPoint **mount_point_list_head) {