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/rpcb_clnt.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/rpcb_clnt.c')
| -rw-r--r-- | sys/rpc/rpcb_clnt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/rpc/rpcb_clnt.c b/sys/rpc/rpcb_clnt.c index 9b23fb3..d484df3 100644 --- a/sys/rpc/rpcb_clnt.c +++ b/sys/rpc/rpcb_clnt.c @@ -477,7 +477,7 @@ local_rpcb() tsize = __rpc_get_t_size(AF_LOCAL, 0, 0); client = clnt_vc_create(so, (struct sockaddr *)&sun, (rpcprog_t)RPCBPROG, - (rpcvers_t)RPCBVERS, tsize, tsize); + (rpcvers_t)RPCBVERS, tsize, tsize, 1); if (client != NULL) { /* Mark the socket to be closed in destructor */ |
