chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2054a5b
)
umount: properly enumerate loopback devices
author
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Oct 2010 22:42:44 +0000
(
00:42
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Oct 2010 22:42:44 +0000
(
00:42
+0200)
src/umount.c
patch
|
blob
|
history
diff --git
a/src/umount.c
b/src/umount.c
index 79fbba73244e8b33d3d58620583e90f3132ba86e..bd4f01ff64ae553d5cbdef1c77ff0cbf411e3ad6 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,7
+262,9
@@
finish:
if (e)
udev_enumerate_unref(e);
if (e)
udev_enumerate_unref(e);
- free(udev);
+ if (udev)
+ udev_unref(udev);
+
return r;
}
return r;
}