lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Alexandros Batsakis
2009-09-10 12:27:21 +03:00
committed by J. Bruce Fields
parent 0421b5c55a
commit 3ddc8bf5f3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfsd/nfs4callback.c
View File

@@ -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)
.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)
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)) {