diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-08-20 18:00:16 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 15:25:24 -0700 |
| commit | c946556b8749beb357e2d2860e7dac757972dd3d (patch) | |
| tree | 63a7a403984febfcaab31a13726b68be1f627486 /fs/nfs/nfs4client.c | |
| parent | dd018428dce087b72d9e6a0b32e93cb8088b3aaa (diff) | |
| download | linux-c946556b8749beb357e2d2860e7dac757972dd3d.tar.gz linux-c946556b8749beb357e2d2860e7dac757972dd3d.tar.bz2 linux-c946556b8749beb357e2d2860e7dac757972dd3d.zip | |
NFS: move per-net callback thread initialization to nfs_callback_up_net()
v4:
1) Callback transport creation routine selection by version simlified.
This new function in now called before nfs_minorversion_callback_svc_setup()).
Also few small changes:
1) current network namespace in nfs_callback_up() was replaced by transport net.
2) svc_shutdown_net() was moved prior to callback usage counter decrement
(because in case of per-net data allocation faulure svc_shutdown_net() have to
be skipped).
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4client.c')
| -rw-r--r-- | fs/nfs/nfs4client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 088a7d2e2ecb..612f5ebaabac 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -84,7 +84,7 @@ error: static void nfs4_destroy_callback(struct nfs_client *clp) { if (__test_and_clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state)) - nfs_callback_down(clp->cl_mvops->minor_version, &init_net); + nfs_callback_down(clp->cl_mvops->minor_version, clp->cl_net); } static void nfs4_shutdown_client(struct nfs_client *clp) |