summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorAlexandros Batsakis <batsakis@netapp.com>2009-09-10 12:27:21 +0300
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-09-15 20:52:13 -0400
commit3ddc8bf5f31c906c558ce3da4856208a864d2fc1 (patch)
treedc0e56c769fee36ea66b724826d6112382e22bb3 /fs/nfsd
parent0421b5c55acd0e88920cb9a5bcea6ed738186853 (diff)
downloadlinux-3.10-3ddc8bf5f31c906c558ce3da4856208a864d2fc1.tar.gz
linux-3.10-3ddc8bf5f31c906c558ce3da4856208a864d2fc1.tar.bz2
linux-3.10-3ddc8bf5f31c906c558ce3da4856208a864d2fc1.zip
nfsd41: modify nfsd4.1 backchannel to use new xprt class
This patch enables the use of the nfsv4.1 backchannel. Signed-off-by: Alexandros Batsakis <batsakis@netapp.com> [initialize rpc_create_args.bc_xprt too] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4callback.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 89f23eddb8f..24e8d78f8dd 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -48,6 +48,7 @@
#include <linux/nfsd/state.h>
#include <linux/sunrpc/sched.h>
#include <linux/nfs4.h>
+#include <linux/sunrpc/xprtsock.h>
#define NFSDDBG_FACILITY NFSDDBG_PROC
@@ -483,7 +484,7 @@ int setup_callback_client(struct nfs4_client *clp)
.to_retries = 0,
};
struct rpc_create_args args = {
- .protocol = IPPROTO_TCP,
+ .protocol = XPRT_TRANSPORT_TCP,
.address = (struct sockaddr *) &cb->cb_addr,
.addrsize = cb->cb_addrlen,
.timeout = &timeparms,
@@ -498,7 +499,10 @@ int setup_callback_client(struct nfs4_client *clp)
if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5))
return -EINVAL;
-
+ if (cb->cb_minorversion) {
+ args.bc_xprt = clp->cl_cb_xprt;
+ args.protocol = XPRT_TRANSPORT_BC_TCP;
+ }
/* Create RPC client */
client = rpc_create(&args);
if (IS_ERR(client)) {