From b2e811621c23b090f0a6428e112a67cbdb48769d Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 13 Mar 2013 21:06:03 +0000 Subject: 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. --- sys/rpc/clnt_vc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/rpc/clnt_vc.c') 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; -- cgit v1.1