diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-11-29 11:35:35 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-12-06 16:18:52 -0500 |
| commit | 2fefb8a09e7ed251ae8996e0c69066e74c5aa560 (patch) | |
| tree | 6d353a2051063f63f4667d9e2d54ec30dec91049 /net | |
| parent | 7710ec36b6f516e026f9e29e50e67d2547c2a79b (diff) | |
| download | op-kernel-dev-2fefb8a09e7ed251ae8996e0c69066e74c5aa560.zip op-kernel-dev-2fefb8a09e7ed251ae8996e0c69066e74c5aa560.tar.gz | |
svcrpc: destroy server sockets all at once
There's no reason I can see that we need to call sv_shutdown between
closing the two lists of sockets.
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/svc.c | 7 | ||||
| -rw-r--r-- | net/sunrpc/svc_xprt.c | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 6e03888..60babf0 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -528,16 +528,11 @@ svc_destroy(struct svc_serv *serv) del_timer_sync(&serv->sv_temptimer); - svc_close_all(&serv->sv_tempsocks); + svc_close_all(serv); if (serv->sv_shutdown) serv->sv_shutdown(serv); - svc_close_all(&serv->sv_permsocks); - - BUG_ON(!list_empty(&serv->sv_permsocks)); - BUG_ON(!list_empty(&serv->sv_tempsocks)); - cache_clean_deferred(serv); if (svc_serv_is_pooled(serv)) diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 8046c6d..099ddf9 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -929,7 +929,7 @@ void svc_close_xprt(struct svc_xprt *xprt) } EXPORT_SYMBOL_GPL(svc_close_xprt); -void svc_close_all(struct list_head *xprt_list) +static void svc_close_list(struct list_head *xprt_list) { struct svc_xprt *xprt; struct svc_xprt *tmp; @@ -947,6 +947,15 @@ void svc_close_all(struct list_head *xprt_list) } } +void svc_close_all(struct svc_serv *serv) +{ + svc_close_list(&serv->sv_tempsocks); + svc_close_list(&serv->sv_permsocks); + BUG_ON(!list_empty(&serv->sv_permsocks)); + BUG_ON(!list_empty(&serv->sv_tempsocks)); + +} + /* * Handle defer and revisit of requests */ |
