aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2008-09-28 02:21:26 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-09-29 18:13:40 -0400
commitd5b337b4877f7c4e1d761434ee04d045b0201e03 (patch)
tree0c31c4cfb0f2010a87b0f1ae7246cbd50068306e /fs
parent97eb89bb0e5d9ab20dbc677cb18fad1421473287 (diff)
nfsd: use nfs client rpc callback program
since commit ff7d9756b501744540be65e172d27ee321d86103 "nfsd: use static memory for callback program and stats" do_probe_callback uses a static callback program (NFS4_CALLBACK) rather than the one set in clp->cl_callback.cb_prog as passed in by the client in setclientid (4.0) or create_session (4.1). This patches introduces rpc_create_args.prognumber that allows overriding program->number when creating rpc_clnt. Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4callback.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index f7c793a5b803..094747a1227c 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -380,6 +380,7 @@ static int do_probe_callback(void *data)
380 .addrsize = sizeof(addr), 380 .addrsize = sizeof(addr),
381 .timeout = &timeparms, 381 .timeout = &timeparms,
382 .program = &cb_program, 382 .program = &cb_program,
383 .prognumber = cb->cb_prog,
383 .version = nfs_cb_version[1]->number, 384 .version = nfs_cb_version[1]->number,
384 .authflavor = RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */ 385 .authflavor = RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */
385 .flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET), 386 .flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),