Commit 3ddc8bf5 authored by Alexandros Batsakis's avatar Alexandros Batsakis Committed by J. Bruce Fields

nfsd41: modify nfsd4.1 backchannel to use new xprt class

This patch enables the use of the nfsv4.1 backchannel.
Signed-off-by: default avatarAlexandros Batsakis <batsakis@netapp.com>
[initialize rpc_create_args.bc_xprt too]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 0421b5c5
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include <linux/nfsd/state.h> #include <linux/nfsd/state.h>
#include <linux/sunrpc/sched.h> #include <linux/sunrpc/sched.h>
#include <linux/nfs4.h> #include <linux/nfs4.h>
#include <linux/sunrpc/xprtsock.h>
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC
...@@ -483,7 +484,7 @@ int setup_callback_client(struct nfs4_client *clp) ...@@ -483,7 +484,7 @@ int setup_callback_client(struct nfs4_client *clp)
.to_retries = 0, .to_retries = 0,
}; };
struct rpc_create_args args = { struct rpc_create_args args = {
.protocol = IPPROTO_TCP, .protocol = XPRT_TRANSPORT_TCP,
.address = (struct sockaddr *) &cb->cb_addr, .address = (struct sockaddr *) &cb->cb_addr,
.addrsize = cb->cb_addrlen, .addrsize = cb->cb_addrlen,
.timeout = &timeparms, .timeout = &timeparms,
...@@ -498,7 +499,10 @@ int setup_callback_client(struct nfs4_client *clp) ...@@ -498,7 +499,10 @@ int setup_callback_client(struct nfs4_client *clp)
if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5)) if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5))
return -EINVAL; return -EINVAL;
if (cb->cb_minorversion) {
args.bc_xprt = clp->cl_cb_xprt;
args.protocol = XPRT_TRANSPORT_BC_TCP;
}
/* Create RPC client */ /* Create RPC client */
client = rpc_create(&args); client = rpc_create(&args);
if (IS_ERR(client)) { if (IS_ERR(client)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment