diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-11-29 11:35:35 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 16:13:31 -0800 |
| commit | 0832fe15fcb1360f977681569c6493a59d19dd3c (patch) | |
| tree | 3a4164dc719fa2d9b724f0fa34052a99499bf356 /net/sunrpc/svc.c | |
| parent | bcf641763cf916797543f032714e0478e48c2ef7 (diff) | |
| download | lwn-0832fe15fcb1360f977681569c6493a59d19dd3c.tar.gz lwn-0832fe15fcb1360f977681569c6493a59d19dd3c.zip | |
svcrpc: destroy server sockets all at once
commit 2fefb8a09e7ed251ae8996e0c69066e74c5aa560 upstream.
There's no reason I can see that we need to call sv_shutdown between
closing the two lists of sockets.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/sunrpc/svc.c')
| -rw-r--r-- | net/sunrpc/svc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 5443ffdf336c..7ddfb04ca2a6 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -531,16 +531,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)) |