summaryrefslogtreecommitdiffstats
path: root/sys/fs/autofs/autofs.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/autofs/autofs.c')
-rw-r--r--sys/fs/autofs/autofs.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/fs/autofs/autofs.c b/sys/fs/autofs/autofs.c
index 235d09d..6fcfa76 100644
--- a/sys/fs/autofs/autofs.c
+++ b/sys/fs/autofs/autofs.c
@@ -450,11 +450,6 @@ autofs_trigger_one(struct autofs_node *anp,
&autofs_softc->sc_lock);
autofs_restore_sigmask(&oldset);
if (error != 0) {
- /*
- * XXX: For some reson 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;
@@ -520,7 +515,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;
@@ -566,11 +561,6 @@ autofs_ioctl_request(struct autofs_daemon_request *adr)
error = cv_wait_sig(&autofs_softc->sc_cv,
&autofs_softc->sc_lock);
if (error != 0) {
- /*
- * XXX: For some reson this returns -1 instead
- * of EINTR, wtf?!
- */
- error = EINTR;
sx_xunlock(&autofs_softc->sc_lock);
AUTOFS_DEBUG("failed with error %d", error);
return (error);
OpenPOWER on IntegriCloud