picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core/automount: revise the "fun fact" comments. (#6245)

Browse source 
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.
This commit is contained in:
NeilBrown 2017-07-01 02:51:33 +10:00 committed by Zbigniew Jędrzejewski-Szmek
parent 78c1edd1ef
commit ca5b440aa7
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/automount.c
View file

@ -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;