On Fri, 19 Jun 2015 16:30:18 -0400 Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> wrote: > Steven, how about something like the following patch? > OK, the box I'm running this on is using v4.0.5, can you make a patch based on that, as whatever you make needs to go to stable as well. distcc[31554] ERROR: compile /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c on fedora/8 failed distcc[31554] (dcc_build_somewhere) Warning: remote compilation of '/home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c' failed, retrying locally distcc[31554] Warning: failed to distribute /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c to fedora/8, running locally instead /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c: In function 'xs_tcp_shutdown': /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c:643:3: error: implicit declaration of function 'xs_reset_transport' [-Werror=implicit-function-declaration] /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c: At top level: /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c:825:13: warning: conflicting types for 'xs_reset_transport' [enabled by default] /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c:825:13: error: static declaration of 'xs_reset_transport' follows non-static declaration /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c:643:3: note: previous implicit declaration of 'xs_reset_transport' was here cc1: some warnings being treated as errors distcc[31554] ERROR: compile /home/rostedt/work/git/nobackup/linux-build.git/net/sunrpc/xprtsock.c on localhost failed /home/rostedt/work/git/nobackup/linux-build.git/scripts/Makefile.build:258: recipe for target 'net/sunrpc/xprtsock.o' failed make[3]: *** [net/sunrpc/xprtsock.o] Error 1 -- Steve > 8<----------------------------------------------------------------- > >From 9a0bcfdbdbc793eae1ed6d901a6396b6c66f9513 Mon Sep 17 00:00:00 2001 > From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > Date: Fri, 19 Jun 2015 16:17:57 -0400 > Subject: [PATCH] SUNRPC: Ensure we release the TCP socket once it has been > closed > > This fixes a regression introduced by commit caf4ccd4e88cf2 ("SUNRPC: > Make xs_tcp_close() do a socket shutdown rather than a sock_release"). > Prior to that commit, the autoclose feature would ensure that an > idle connection would result in the socket being both disconnected and > released, whereas now only gets disconnected. > > While the current behaviour is harmless, it does leave the port bound > until either RPC traffic resumes or the RPC client is shut down. > > Reported-by: Steven Rostedt <rostedt@xxxxxxxxxxx> > Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > --- > net/sunrpc/xprt.c | 2 +- > net/sunrpc/xprtsock.c | 8 ++++++-- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c > index 3ca31f20b97c..ab5dd621ae0c 100644 > --- a/net/sunrpc/xprt.c > +++ b/net/sunrpc/xprt.c > @@ -611,8 +611,8 @@ static void xprt_autoclose(struct work_struct *work) > struct rpc_xprt *xprt = > container_of(work, struct rpc_xprt, task_cleanup); > > - xprt->ops->close(xprt); > clear_bit(XPRT_CLOSE_WAIT, &xprt->state); > + xprt->ops->close(xprt); > xprt_release_write(xprt, NULL); > } > > diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c > index fda8ec8c74c0..75dcdadf0269 100644 > --- a/net/sunrpc/xprtsock.c > +++ b/net/sunrpc/xprtsock.c > @@ -634,10 +634,13 @@ static void xs_tcp_shutdown(struct rpc_xprt *xprt) > struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); > struct socket *sock = transport->sock; > > - if (sock != NULL) { > + if (sock == NULL) > + return; > + if (xprt_connected(xprt)) { > kernel_sock_shutdown(sock, SHUT_RDWR); > trace_rpc_socket_shutdown(xprt, sock); > - } > + } else > + xs_reset_transport(transport); > } > > /** > @@ -786,6 +789,7 @@ static void xs_sock_mark_closed(struct rpc_xprt *xprt) > xs_sock_reset_connection_flags(xprt); > /* Mark transport as closed and wake up all pending tasks */ > xprt_disconnect_done(xprt); > + xprt_force_disconnect(xprt); > } > > /** -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in