diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-08-28 16:05:35 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-09-10 16:48:37 +0900 |
| commit | 8437c0593f9da76d569c0e4412734c867dcbda21 (patch) | |
| tree | 5db843bdd650393d3fe5078e6be8fcaa8af8860e /src/mount | |
| parent | e132a043926c9bea72b41ea1fd921882976ff94f (diff) | |
| download | systemd-8437c0593f9da76d569c0e4412734c867dcbda21.tar.gz | |
tree-wide: replace device_enumerator_scan_devices()+FOREACH_DEVICE_AND_SUBSYSTEM() by FOREACH_DEVICE()
Diffstat (limited to 'src/mount')
| -rw-r--r-- | src/mount/mount-tool.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 5ce9644861..56ded606f5 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -5,10 +5,10 @@ #include "sd-bus.h" #include "sd-device.h" -#include "device-enumerator-private.h" #include "bus-error.h" #include "bus-unit-util.h" #include "bus-util.h" +#include "device-util.h" #include "dirent-util.h" #include "escape.h" #include "fd-util.h" @@ -1420,11 +1420,7 @@ static int list_devices(void) { if (r < 0) return log_error_errno(r, "Failed to add property match: %m"); - r = device_enumerator_scan_devices(e); - if (r < 0) - return log_error_errno(r, "Failed to enumerate devices: %m"); - - FOREACH_DEVICE_AND_SUBSYSTEM(e, d) { + FOREACH_DEVICE(e, d) { struct item *j; if (!GREEDY_REALLOC0(items, n_allocated, n+1)) { |