Author: trasz
Date: Sun Sep 21 10:34:15 2014
New Revision: 271927
URL: http://svnweb.freebsd.org/changeset/base/271927
Log:
Turns out -1 is a perfectly valid error number, ERESTART. Remove useless
code written under assumption that it wasn't.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/fs/autofs/autofs.c
Modified: head/sys/fs/autofs/autofs.c
==============================================================================
--- head/sys/fs/autofs/autofs.c Sun Sep 21 10:05:27 2014 (r271926)
+++ head/sys/fs/autofs/autofs.c Sun Sep 21 10:34:15 2014 (r271927)
@@ -429,11 +429,6 @@ autofs_trigger_one(struct autofs_node *a
&autofs_softc->sc_lock);
autofs_restore_sigmask(&oldset);
if (error != 0) {
- /*
- * XXX: For some reason this returns -1
- * instead of EINTR, wtf?!
- */
- error = EINTR;
AUTOFS_WARN("cv_wait_sig for %s failed "
"with error %d", ar->ar_path, error);
break;
@@ -495,7 +490,7 @@ autofs_trigger(struct autofs_node *anp,
anp->an_retries = 0;
return (0);
}
- if (error == EINTR) {
+ if (error == EINTR || error == ERESTART) {
AUTOFS_DEBUG("trigger interrupted by signal, "
"not retrying");
anp->an_retries = 0;
@@ -541,11 +536,6 @@ autofs_ioctl_request(struct autofs_daemo
error = cv_wait_sig(&autofs_softc->sc_cv,
&autofs_softc->sc_lock);
if (error != 0) {
- /*
- * XXX: For some reason this returns -1 instead
- * of EINTR, wtf?!
- */
- error = EINTR;
sx_xunlock(&autofs_softc->sc_lock);
AUTOFS_DEBUG("failed with error %d", error);
return (error);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
