From ca5b440aa7722dee7f3949ed79c9de606581bc10 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sat, 1 Jul 2017 02:51:33 +1000 Subject: [PATCH] core/automount: revise the "fun fact" comments. (#6245) Fun fact 1 suggests that a "close()" is needed, but that close() has long since been removed. So the comment in now meaningless and possibly confusing. Fun fact 2 refers to a bug that has been fixed in Linux prior to v4.12 Commit: 9fa4eb8e490a ("autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL") so revise the comment so that no-one goes pointlessly looking for the bug. --- src/core/automount.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/core/automount.c b/src/core/automount.c index c040efa..6a5612a 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; -- 2.7.4