summaryrefslogtreecommitdiff
path: root/src/core/automount.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/automount.c')
-rw-r--r--src/core/automount.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/core/automount.c b/src/core/automount.c
index c040efa931..6a5612a769 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -474,10 +474,10 @@ static int automount_send_ready(Automount *a, Set *tokens, int status) {
while ((token = PTR_TO_UINT(set_steal_first(tokens)))) {
int k;
- /* Autofs fun fact II:
+ /* Autofs fun fact:
*
- * if you pass a positive status code here, the kernel will
- * freeze! Yay! */
+ * if you pass a positive status code here, kernels
+ * prior to 4.12 will freeze! Yay! */
k = autofs_send_ready(UNIT(a)->manager->dev_autofs_fd,
ioctl_fd,
@@ -619,12 +619,6 @@ static void automount_enter_waiting(Automount *a) {
if (r < 0)
goto fail;
- /* Autofs fun fact:
- *
- * Unless we close the ioctl fd here, for some weird reason
- * the direct mount will not receive events from the
- * kernel. */
-
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;