summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/svc.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-11-29 11:35:35 -0500
committerJ. Bruce Fields <bfields@redhat.com>2011-12-06 16:18:52 -0500
commit2fefb8a09e7ed251ae8996e0c69066e74c5aa560 (patch)
tree6d353a2051063f63f4667d9e2d54ec30dec91049 /net/sunrpc/svc.c
parent7710ec36b6f516e026f9e29e50e67d2547c2a79b (diff)
downloadlinux-2fefb8a09e7ed251ae8996e0c69066e74c5aa560.tar.bz2
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/sunrpc/svc.c')
-rw-r--r--net/sunrpc/svc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 6e038884ae0c..60babf0a9847 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))