nfs4: minor callback code simplification, comment
Note the position in the version array doesn't have to match the actual rpc version number--to me it seems clearer to maintain the distinction. Also document choice of rpc callback version number, as discussed in e.g. http://www.ietf.org/mail-archive/web/nfsv4/current/msg07985.html and followups. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
15ddb4aec5
commit
b7299f4439
@ -424,13 +424,19 @@ static struct rpc_procinfo nfs4_cb_procedures[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct rpc_version nfs_cb_version4 = {
|
static struct rpc_version nfs_cb_version4 = {
|
||||||
|
/*
|
||||||
|
* Note on the callback rpc program version number: despite language in rfc
|
||||||
|
* 5661 section 18.36.3 requiring servers to use 4 in this field, the
|
||||||
|
* official xdr descriptions for both 4.0 and 4.1 specify version 1, and
|
||||||
|
* in practice that appears to be what implementations use. The section
|
||||||
|
* 18.36.3 language is expected to be fixed in an erratum.
|
||||||
|
*/
|
||||||
.number = 1,
|
.number = 1,
|
||||||
.nrprocs = ARRAY_SIZE(nfs4_cb_procedures),
|
.nrprocs = ARRAY_SIZE(nfs4_cb_procedures),
|
||||||
.procs = nfs4_cb_procedures
|
.procs = nfs4_cb_procedures
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct rpc_version * nfs_cb_version[] = {
|
static struct rpc_version * nfs_cb_version[] = {
|
||||||
NULL,
|
|
||||||
&nfs_cb_version4,
|
&nfs_cb_version4,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -471,7 +477,7 @@ int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *cb)
|
|||||||
.timeout = &timeparms,
|
.timeout = &timeparms,
|
||||||
.program = &cb_program,
|
.program = &cb_program,
|
||||||
.prognumber = cb->cb_prog,
|
.prognumber = cb->cb_prog,
|
||||||
.version = nfs_cb_version[1]->number,
|
.version = 0,
|
||||||
.authflavor = clp->cl_flavor,
|
.authflavor = clp->cl_flavor,
|
||||||
.flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),
|
.flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),
|
||||||
.client_name = clp->cl_principal,
|
.client_name = clp->cl_principal,
|
||||||
|
Loading…
Reference in New Issue
Block a user