chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core/unit: fix unit_add_target_dependencies() for units with no dependencies
[elogind.git]
/
src
/
core
/
automount.c
diff --git
a/src/core/automount.c
b/src/core/automount.c
index c6e0a74707c7648344798daa6bf9fed2083bb9e1..889b20e25dd7addeb04d733e2663652a96e6f1df 100644
(file)
--- a/
src/core/automount.c
+++ b/
src/core/automount.c
@@
-256,7
+256,7
@@
static int automount_coldplug(Unit *u) {
assert(a->pipe_fd >= 0);
assert(a->pipe_fd >= 0);
- r = sd_event_add_io(u->manager->event,
a->pipe_fd, EPOLLIN, automount_dispatch_io, u, &a->pipe_event_source
);
+ r = sd_event_add_io(u->manager->event,
&a->pipe_event_source, a->pipe_fd, EPOLLIN, automount_dispatch_io, u
);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-531,7
+531,7
@@
static void automount_enter_waiting(Automount *a) {
close_nointr_nofail(ioctl_fd);
ioctl_fd = -1;
close_nointr_nofail(ioctl_fd);
ioctl_fd = -1;
- r = sd_event_add_io(UNIT(a)->manager->event,
p[0], EPOLLIN, automount_dispatch_io, a, &a->pipe_event_source
);
+ r = sd_event_add_io(UNIT(a)->manager->event,
&a->pipe_event_source, p[0], EPOLLIN, automount_dispatch_io, a
);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-774,8
+774,8
@@
static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
get_process_comm(packet.v5_packet.pid, &p);
log_info_unit(UNIT(a)->id,
get_process_comm(packet.v5_packet.pid, &p);
log_info_unit(UNIT(a)->id,
- "Got automount request for %s, triggered by
%lu
(%s)",
- a->where,
(unsigned long)
packet.v5_packet.pid, strna(p));
+ "Got automount request for %s, triggered by
"PID_FMT"
(%s)",
+ a->where, packet.v5_packet.pid, strna(p));
} else
log_debug_unit(UNIT(a)->id, "Got direct mount request on %s", a->where);
} else
log_debug_unit(UNIT(a)->id, "Got direct mount request on %s", a->where);
@@
-874,7
+874,6
@@
const UnitVTable automount_vtable = {
.bus_interface = "org.freedesktop.systemd1.Automount",
.bus_vtable = bus_automount_vtable,
.bus_interface = "org.freedesktop.systemd1.Automount",
.bus_vtable = bus_automount_vtable,
- .bus_changing_properties = bus_automount_changing_properties,
.shutdown = automount_shutdown,
.shutdown = automount_shutdown,