diff options
| author | trasz <trasz@FreeBSD.org> | 2015-03-07 20:00:26 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2015-03-07 20:00:26 +0000 |
| commit | 95a939758e8e5a2d1d10bb2f7076ce7200af48fa (patch) | |
| tree | 213b3f8860c027a9421147b3aebbb9f25596f825 /sys/fs/autofs | |
| parent | 58168bdd0f3109ffe2e0f7a3acd77b47a96a6a1f (diff) | |
| download | FreeBSD-src-95a939758e8e5a2d1d10bb2f7076ce7200af48fa.zip FreeBSD-src-95a939758e8e5a2d1d10bb2f7076ce7200af48fa.tar.gz | |
MFC r271927:
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
Diffstat (limited to 'sys/fs/autofs')
| -rw-r--r-- | sys/fs/autofs/autofs.c | 12 |
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); |
