diff options
| author | jhb <jhb@FreeBSD.org> | 2013-03-13 21:06:03 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2013-03-13 21:06:03 +0000 |
| commit | b2e811621c23b090f0a6428e112a67cbdb48769d (patch) | |
| tree | fa2ef41d7bc070ef5ac51a82695e8b8ed5cde34c /sys/rpc | |
| parent | 731061beabff7b87230da8252aed09e0a08701ea (diff) | |
| download | FreeBSD-src-b2e811621c23b090f0a6428e112a67cbdb48769d.zip FreeBSD-src-b2e811621c23b090f0a6428e112a67cbdb48769d.tar.gz | |
Revert 195703 and 195821 as this special stop handling in NFS is now
implemented via VFCF_SBDRY rather than passing PBDRY to individual
sleep calls.
Diffstat (limited to 'sys/rpc')
| -rw-r--r-- | sys/rpc/clnt_rc.c | 3 | ||||
| -rw-r--r-- | sys/rpc/clnt_vc.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/rpc/clnt_rc.c b/sys/rpc/clnt_rc.c index b910059..0015b3b 100644 --- a/sys/rpc/clnt_rc.c +++ b/sys/rpc/clnt_rc.c @@ -247,8 +247,7 @@ clnt_reconnect_call( stat = clnt_reconnect_connect(cl); if (stat == RPC_SYSTEMERROR) { error = tsleep(&fake_wchan, - rc->rc_intr ? PCATCH | PBDRY : 0, "rpccon", - hz); + rc->rc_intr ? PCATCH : 0, "rpccon", hz); if (error == EINTR || error == ERESTART) return (RPC_INTR); tries++; diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c index bc48e19..eec9f50 100644 --- a/sys/rpc/clnt_vc.c +++ b/sys/rpc/clnt_vc.c @@ -162,7 +162,7 @@ clnt_vc_create( interrupted = 0; sleep_flag = PSOCK; if (intrflag != 0) - sleep_flag |= (PCATCH | PBDRY); + sleep_flag |= PCATCH; while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { error = msleep(&so->so_timeo, SOCK_MTX(so), @@ -470,7 +470,6 @@ call_again: errp->re_errno = error; switch (error) { case EINTR: - case ERESTART: stat = RPC_INTR; break; case EWOULDBLOCK: @@ -704,7 +703,7 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) case CLSET_INTERRUPTIBLE: if (*(int *) info) - ct->ct_waitflag = PCATCH | PBDRY; + ct->ct_waitflag = PCATCH; else ct->ct_waitflag = 0; break; |
