d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r271927:

Browse Source 
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
This commit is contained in:
trasz 2015-03-07 20:00:26 +00:00
parent 58168bdd0f
commit 95a939758e
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/fs/autofs/autofs.c
View File

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