Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7299f44 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 15ddb4ae

fs/nfsd/nfs4callback.c

+8 −2
Original line number Diff line number Diff line
@@ -424,13 +424,19 @@ static struct rpc_procinfo nfs4_cb_procedures[] = { 
};



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,

        .nrprocs                = ARRAY_SIZE(nfs4_cb_procedures),

        .procs                  = nfs4_cb_procedures

};



static struct rpc_version *	nfs_cb_version[] = {

	NULL,

	&nfs_cb_version4,

};
@@ -471,7 +477,7 @@ int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *cb) 
		.timeout	= &timeparms,

		.program	= &cb_program,

		.prognumber	= cb->cb_prog,

		.version	= nfs_cb_version[1]->number,

		.version	= 0,

		.authflavor	= clp->cl_flavor,

		.flags		= (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),

		.client_name    = clp->cl_principal,