redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

SUNRPC: Don't disconnect if a connection is still in progress.

Browse source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2009-03-11 14:37:58 -04:00
parent 670f945731
commit 40d2549db5
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/sunrpc/xprtsock.c
View file

@ -1613,10 +1613,9 @@ out:
* We need to preserve the port number so the reply cache on the server can * We need to preserve the port number so the reply cache on the server can
* find our cached RPC replies when we get around to reconnecting. * find our cached RPC replies when we get around to reconnecting.
*/ */
static void xs_tcp_reuse_connection(struct rpc_xprt *xprt) static void xs_abort_connection(struct rpc_xprt *xprt, struct sock_xprt *transport)
{ {
int result; int result;
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
struct sockaddr any; struct sockaddr any;
dprintk("RPC: disconnecting xprt %p to reuse port\n", xprt); dprintk("RPC: disconnecting xprt %p to reuse port\n", xprt);
@ -1633,6 +1632,17 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt)
result); result);
} }
static void xs_tcp_reuse_connection(struct rpc_xprt *xprt, struct sock_xprt *transport)
{
unsigned int state = transport->inet->sk_state;
if (state == TCP_CLOSE && transport->sock->state == SS_UNCONNECTED)
return;
if ((1 << state) & (TCPF_ESTABLISHED|TCPF_SYN_SENT))
return;
xs_abort_connection(xprt, transport);
}
static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
{ {
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
@ -1706,7 +1716,7 @@ static void xs_tcp_connect_worker4(struct work_struct *work)
} }
} else } else
/* "close" the socket, preserving the local port */ /* "close" the socket, preserving the local port */
xs_tcp_reuse_connection(xprt); xs_tcp_reuse_connection(xprt, transport);
dprintk("RPC: worker connecting xprt %p to address: %s\n", dprintk("RPC: worker connecting xprt %p to address: %s\n",
xprt, xprt->address_strings[RPC_DISPLAY_ALL]); xprt, xprt->address_strings[RPC_DISPLAY_ALL]);
@ -1766,7 +1776,7 @@ static void xs_tcp_connect_worker6(struct work_struct *work)
} }
} else } else
/* "close" the socket, preserving the local port */ /* "close" the socket, preserving the local port */
xs_tcp_reuse_connection(xprt); xs_tcp_reuse_connection(xprt, transport);
dprintk("RPC: worker connecting xprt %p to address: %s\n", dprintk("RPC: worker connecting xprt %p to address: %s\n",
xprt, xprt->address_strings[RPC_DISPLAY_ALL]); xprt, xprt->address_strings[RPC_DISPLAY_ALL]);