diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-05-04 12:49:41 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-05-31 20:29:40 -0400 |
| commit | 786185b5f8abefa6a8a16695bb4a59c164d5a071 (patch) | |
| tree | 780eafd98f98a093fda540898595b47b4261764c /net/sunrpc | |
| parent | 9793f7c88937e7ac07305ab1af1a519225836823 (diff) | |
| download | talos-op-linux-786185b5f8abefa6a8a16695bb4a59c164d5a071.tar.gz talos-op-linux-786185b5f8abefa6a8a16695bb4a59c164d5a071.zip | |
SUNRPC: move per-net operations from svc_destroy()
The idea is to separate service destruction and per-net operations,
because these are two different things and the mix looks ugly.
Notes:
1) For NFS server this patch looks ugly (sorry for that). But these
place will be rewritten soon during NFSd containerization.
2) LockD per-net counter increase int lockd_up() was moved prior to
make_socks() to make lockd_down_net() call safe in case of error.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/svc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index e6d542cee0f3..b7210f5cc893 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -537,8 +537,6 @@ EXPORT_SYMBOL_GPL(svc_shutdown_net); void svc_destroy(struct svc_serv *serv) { - struct net *net = current->nsproxy->net_ns; - dprintk("svc: svc_destroy(%s, %d)\n", serv->sv_program->pg_name, serv->sv_nrthreads); @@ -553,8 +551,6 @@ svc_destroy(struct svc_serv *serv) del_timer_sync(&serv->sv_temptimer); - svc_shutdown_net(serv, net); - /* * The last user is gone and thus all sockets have to be destroyed to * the point. Check this. |
