mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-29 12:03:03 +00:00
Code Issues Releases Activity

Turns out -1 is a perfectly valid error number, ERESTART. Remove useless

Browse Source 
code written under assumption that it wasn't.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2014-09-21 10:34:15 +00:00
parent b81577dd23
commit 31a4b1aa03
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=271927
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

@ -429,11 +429,6 @@ autofs_trigger_one(struct autofs_node *anp,
&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_daemon_request *adr)
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);