sunrpc-multiple-programs
Subsystems (3)
PATCH 2/11 sunrpc-multiple-programs
Support multiple program numbers on one RPC transport
The NFS and NFSACL programs run on the same RPC transport. This patch adds support for this by changing svc_program into a chained list of programs instead of a single program (on the server side).
Andreas Gruenbacher <[email protected]>, SuSE Labs
fs/nfsd/nfsproc.c +2 -0
@@ -588,6 +588,8 @@ nfserrno (int errno) { nfserr_jukebox, -ETIMEDOUT }, { nfserr_dropit, -EAGAIN }, { nfserr_dropit, -ENOMEM }, + { nfserr_notsupp, -ENOTSUPP }, + { nfserr_notsupp, -EOPNOTSUPP }, { -1, -EIO } };int i;
include/linux/sunrpc/svc.h +2 -1
@@ -232,9 +232,10 @@ struct svc_deferred_req { };/* -* RPC program +* List of RPC programs on the same transport endpoint */ struct svc_program { +struct svc_program * pg_next;/* other programs (same xprt) */ u32 pg_prog;/* program number */ unsigned int pg_lovers;/* lowest version */ unsigned int pg_hivers;/* lowest version */
net/sunrpc/svc.c +5 -3
@@ -326,8 +326,10 @@ svc_process(struct svc_serv *serv, struc goto sendit; } - progp = serv->sv_program; -if (prog != progp->pg_prog) +for (progp = serv->sv_program; progp; progp = progp->pg_next) +if (prog == progp->pg_prog) +break ; +if (progp ==NULL ) goto err_bad_prog; if (vers >= progp->pg_nvers ||
@@ -440,7 +442,7 @@ err_bad_auth: err_bad_prog:#ifdef RPC_PARANOIA -if (prog !=100227 || progp->pg_prog !=100003 ) +if (prog !=100227 || serv->sv_program->pg_prog !=100003 )printk ("svc: unknown program %d (me %d)\n" , prog, progp->pg_prog);/* else it is just a Solaris client seeing if ACLs are supported */ #endif