diff options
author | rmacklem <rmacklem@FreeBSD.org> | 2011-04-27 18:19:26 +0000 |
---|---|---|
committer | rmacklem <rmacklem@FreeBSD.org> | 2011-04-27 18:19:26 +0000 |
commit | b6ed6bf65d437f20a27d864b19504b1b74794647 (patch) | |
tree | ee0c9845f07e58264646801249ae55250ef3edae /sys/rpc/clnt_vc.c | |
parent | 4695871f8d57f73b63559a7be2ef78ed105b9a2e (diff) | |
download | FreeBSD-src-b6ed6bf65d437f20a27d864b19504b1b74794647.zip FreeBSD-src-b6ed6bf65d437f20a27d864b19504b1b74794647.tar.gz |
This patch is believed to fix a problem in the kernel rpc for
non-interruptible NFS mounts, where a kernel thread will seem
to be stuck sleeping on "rpccon". The msleep() in clnt_vc_create()
that was waiting to a TCP connect to complete would return ERESTART,
since PCATCH was specified. Then the tsleep() in clnt_reconnect_call()
would sleep for 1 second and then try again and again and...
The patch changes the msleep() in clnt_vc_create() so it only sets
the PCATCH flag for interruptible cases.
Tested by: pho
Reviewed by: jhb
MFC after: 2 weeks
Diffstat (limited to 'sys/rpc/clnt_vc.c')
-rw-r--r-- | sys/rpc/clnt_vc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c index b94526d..ea3b7d1 100644 --- a/sys/rpc/clnt_vc.c +++ b/sys/rpc/clnt_vc.c @@ -168,7 +168,8 @@ clnt_vc_create( const rpcprog_t prog, /* program number */ const rpcvers_t vers, /* version number */ size_t sendsz, /* buffer recv size */ - size_t recvsz) /* buffer send size */ + size_t recvsz, /* buffer send size */ + int intrflag) /* interruptible */ { CLIENT *cl; /* client handle */ struct ct_data *ct = NULL; /* client handle */ @@ -177,7 +178,7 @@ clnt_vc_create( static uint32_t disrupt; struct __rpc_sockinfo si; XDR xdrs; - int error, interrupted, one = 1; + int error, interrupted, one = 1, sleep_flag; struct sockopt sopt; if (disrupt == 0) @@ -196,10 +197,13 @@ clnt_vc_create( error = soconnect(so, raddr, curthread); SOCK_LOCK(so); interrupted = 0; + sleep_flag = PSOCK; + if (intrflag != 0) + sleep_flag |= (PCATCH | PBDRY); while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { error = msleep(&so->so_timeo, SOCK_MTX(so), - PSOCK | PCATCH | PBDRY, "connec", 0); + sleep_flag, "connec", 0); if (error) { if (error == EINTR || error == ERESTART) interrupted = 1; |