aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2009-04-01 09:23:15 -0400
committerBenny Halevy <bhalevy@panasas.com>2009-06-17 17:11:32 -0400
commit0b5b7ae0a853c91015bb3b1729166ca65f693322 (patch)
tree0a2cce02b1446d63dc87f74bce84e6b5787f69bf /fs/nfs/client.c
parente82dc22dac6525a2f365a1d53c0483252d4aa38e (diff)
nfs41: Setup the backchannel
The NFS v4.1 callback service has already been setup, and rpc_xprt->serv points to the svc_serv structure describing it. Invoke the xprt_setup_backchannel() initialization to pre- allocate the necessary backchannel structures. Signed-off-by: Ricardo Labiaga <ricardo.labiaga@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: change nfs4_put_session(nfs4_session**) to nfs4_destroy_session(nfs_session*)] Signed-off-by: Alexandros Batsakis <Alexandros.Batsakis@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [moved xprt_setup_backchannel from nfs4_init_session to nfs4_init_backchannel] Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index ac6575c4da31..4f75ec593be8 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -37,6 +37,7 @@
37#include <linux/in6.h> 37#include <linux/in6.h>
38#include <net/ipv6.h> 38#include <net/ipv6.h>
39#include <linux/nfs_xdr.h> 39#include <linux/nfs_xdr.h>
40#include <linux/sunrpc/bc_xprt.h>
40 41
41#include <asm/system.h> 42#include <asm/system.h>
42 43
@@ -1096,6 +1097,14 @@ static int nfs4_init_callback(struct nfs_client *clp)
1096 int error; 1097 int error;
1097 1098
1098 if (clp->rpc_ops->version == 4) { 1099 if (clp->rpc_ops->version == 4) {
1100 if (nfs4_has_session(clp)) {
1101 error = xprt_setup_backchannel(
1102 clp->cl_rpcclient->cl_xprt,
1103 NFS41_BC_MIN_CALLBACKS);
1104 if (error < 0)
1105 return error;
1106 }
1107
1099 error = nfs_callback_up(clp->cl_minorversion, 1108 error = nfs_callback_up(clp->cl_minorversion,
1100 clp->cl_rpcclient->cl_xprt); 1109 clp->cl_rpcclient->cl_xprt);
1101 if (error < 0) { 1110 if (error < 0) {