svn commit: r309509 - stable/10/usr.sbin/autofs

Edward Tomasz Napierala trasz at FreeBSD.org
Sat Dec 3 19:55:56 UTC 2016


Author: trasz
Date: Sat Dec  3 19:55:55 2016
New Revision: 309509
URL: https://svnweb.freebsd.org/changeset/base/309509

Log:
  MFC r308206:
  
  Make autounmountd(8) not die when traced with "truss -p".

Modified:
  stable/10/usr.sbin/autofs/autounmountd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/autofs/autounmountd.c
==============================================================================
--- stable/10/usr.sbin/autofs/autounmountd.c	Sat Dec  3 19:53:15 2016	(r309508)
+++ stable/10/usr.sbin/autofs/autounmountd.c	Sat Dec  3 19:55:55 2016	(r309509)
@@ -244,8 +244,11 @@ do_wait(int kq, double sleep_time)
 		log_debugx("waiting for filesystem event");
 		nevents = kevent(kq, NULL, 0, &unused, 1, NULL);
 	}
-	if (nevents < 0)
+	if (nevents < 0) {
+		if (errno == EINTR)
+			return;
 		log_err(1, "kevent");
+	}
 
 	if (nevents == 0) {
 		log_debugx("timeout reached");


More information about the svn-src-stable mailing list