From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BB881D131A; Wed, 21 Aug 2024 18:31:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724265069; cv=none; b=ERJ1wNv2mvYYHKzNjiZzDq+vRRs1om7Y5DR/yYtWcwvIobb4D3p25xzeypuKrWIckXzmHJBVtaPBeoK02WUY8g6biRQdTPVfKsM5k2iGy2Y52otvz5EHnG2Ndu+INoMez0KL5igVYCMwkMRpwufrOAWNdEgJQDgg8K39s5AFGqs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724265069; c=relaxed/simple; bh=12wceilYnszmqUQqn57ps2e0494iuaMOKF6pcXlSCr0=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=kBQ200JMzEoZI6RDvTZtfOvnubXDLnAL28ntgC5PqrcahXtNZ3oungofCXPSLQASJf81NvOtOXvFrb2g4EARzlADDYm/mM/DPHz+2uq1p8N5TztzoLO0BRieg0AlengTTwmBRo6KjkCa2CzRLK1dJ1ISmrTH4DbxdMLHjyp5k7k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eLyPAkdr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eLyPAkdr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66670C32781; Wed, 21 Aug 2024 18:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724265069; bh=12wceilYnszmqUQqn57ps2e0494iuaMOKF6pcXlSCr0=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=eLyPAkdrjqQBKRxNOBDEz3YzvoxztFrQpqUyv1XdGGoJ06da04hEQ7Fm0CX2BdtU9 74HnQngY9YVfskfFJdLZKXg8O7+zuxAS3hEFOOki18uMxOoSbtVhEoI8xBbsjXsNSH 0GGZ64S/bwZ5Q03s2ub6XFtA9hFGV4VVgGD/znZRrMr2LIpsxayiAaa+6z3O6Xj5do 1iLCzpDSRZuIYBfy007TfsklYNf3sXTGrFB4XeisCS9ohGhpm+fTjjRlRuerdV4iVF Q7z9BTEARHxXktVJsdhGXGgLUivfsCljytCSfmwUyz+ErrMc9rC6qRy1vWEqzSLFIq 8PjyaY9fJmyqw== Message-ID: <56ffc1da7b6b40e8bc2795dcefc623a19dd364d7.camel@kernel.org> Subject: Re: [PATCH v12 12/24] SUNRPC: replace program list with program array From: Jeff Layton To: Mike Snitzer , linux-nfs@vger.kernel.org Cc: Chuck Lever , Anna Schumaker , Trond Myklebust , NeilBrown , linux-fsdevel@vger.kernel.org Date: Wed, 21 Aug 2024 14:31:07 -0400 In-Reply-To: <20240819181750.70570-13-snitzer@kernel.org> References: <20240819181750.70570-1-snitzer@kernel.org> <20240819181750.70570-13-snitzer@kernel.org> Autocrypt: addr=jlayton@kernel.org; prefer-encrypt=mutual; keydata=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 QZIQXVeAA+smfTT0tDrisj1U5x6ZB9b3nBg65kc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.4 (3.52.4-1.fc40) Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Mon, 2024-08-19 at 14:17 -0400, Mike Snitzer wrote: > From: NeilBrown >=20 > A service created with svc_create_pooled() can be given a linked list of > programs and all of these will be served. >=20 > Using a linked list makes it cumbersome when there are several programs > that can be optionally selected with CONFIG settings. >=20 > After this patch is applied, API consumers must use only > svc_create_pooled() when creating an RPC service that listens for more > than one RPC program. >=20 > Signed-off-by: NeilBrown > Signed-off-by: Mike Snitzer > --- > =C2=A0fs/nfsd/nfsctl.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 |=C2=A0 2 +- > =C2=A0fs/nfsd/nfsd.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +- > =C2=A0fs/nfsd/nfssvc.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 | 67 +++++++++++++++++-------------------- > =C2=A0include/linux/sunrpc/svc.h |=C2=A0 7 ++-- > =C2=A0net/sunrpc/svc.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 | 68 ++++++++++++++++++++++---------------- > =C2=A0net/sunrpc/svc_xprt.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +- > =C2=A0net/sunrpc/svcauth_unix.c=C2=A0 |=C2=A0 3 +- > =C2=A07 files changed, 79 insertions(+), 72 deletions(-) >=20 > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > index 1c9e5b4bcb0a..64c1b4d649bc 100644 > --- a/fs/nfsd/nfsctl.c > +++ b/fs/nfsd/nfsctl.c > @@ -2246,7 +2246,7 @@ static __net_init int nfsd_net_init(struct net *net= ) > =C2=A0 if (retval) > =C2=A0 goto out_repcache_error; > =C2=A0 memset(&nn->nfsd_svcstats, 0, sizeof(nn->nfsd_svcstats)); > - nn->nfsd_svcstats.program =3D &nfsd_program; > + nn->nfsd_svcstats.program =3D &nfsd_programs[0]; > =C2=A0 for (i =3D 0; i < sizeof(nn->nfsd_versions); i++) > =C2=A0 nn->nfsd_versions[i] =3D nfsd_support_version(i); > =C2=A0 for (i =3D 0; i < sizeof(nn->nfsd4_minorversions); i++) > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > index f87a359d968f..232a873dc53a 100644 > --- a/fs/nfsd/nfsd.h > +++ b/fs/nfsd/nfsd.h > @@ -85,7 +85,7 @@ struct nfsd_genl_rqstp { > =C2=A0 u32 rq_opnum[NFSD_MAX_OPS_PER_COMPOUND]; > =C2=A0}; > =C2=A0 > -extern struct svc_program nfsd_program; > +extern struct svc_program nfsd_programs[]; > =C2=A0extern const struct svc_version nfsd_version2, nfsd_version3, nfsd_= version4; > =C2=A0extern struct mutex nfsd_mutex; > =C2=A0extern spinlock_t nfsd_drc_lock; > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > index 1bec3a53e35f..5f8680ab1013 100644 > --- a/fs/nfsd/nfssvc.c > +++ b/fs/nfsd/nfssvc.c > @@ -35,7 +35,6 @@ > =C2=A0#define NFSDDBG_FACILITY NFSDDBG_SVC > =C2=A0 > =C2=A0atomic_t nfsd_th_cnt =3D ATOMIC_INIT(0); > -extern struct svc_program nfsd_program; > =C2=A0static int nfsd(void *vrqstp); > =C2=A0#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) > =C2=A0static int nfsd_acl_rpcbind_set(struct net *, > @@ -87,16 +86,6 @@ static const struct svc_version *localio_versions[] = =3D { > =C2=A0 > =C2=A0#define NFSD_LOCALIO_NRVERS ARRAY_SIZE(localio_versions) > =C2=A0 > -static struct svc_program nfsd_localio_program =3D { > - .pg_prog =3D NFS_LOCALIO_PROGRAM, > - .pg_nvers =3D NFSD_LOCALIO_NRVERS, > - .pg_vers =3D localio_versions, > - .pg_name =3D "nfslocalio", > - .pg_class =3D "nfsd", > - .pg_authenticate =3D &svc_set_client, > - .pg_init_request =3D svc_generic_init_request, > - .pg_rpcbind_set =3D svc_generic_rpcbind_set, > -}; > =C2=A0#endif /* CONFIG_NFSD_LOCALIO */ > =C2=A0 > =C2=A0#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) > @@ -109,23 +98,9 @@ static const struct svc_version *nfsd_acl_version[] = =3D { > =C2=A0# endif > =C2=A0}; > =C2=A0 > -#define NFSD_ACL_MINVERS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 2 > +#define NFSD_ACL_MINVERS 2 > =C2=A0#define NFSD_ACL_NRVERS ARRAY_SIZE(nfsd_acl_version) > =C2=A0 > -static struct svc_program nfsd_acl_program =3D { > -#if IS_ENABLED(CONFIG_NFSD_LOCALIO) > - .pg_next =3D &nfsd_localio_program, > -#endif /* CONFIG_NFSD_LOCALIO */ > - .pg_prog =3D NFS_ACL_PROGRAM, > - .pg_nvers =3D NFSD_ACL_NRVERS, > - .pg_vers =3D nfsd_acl_version, > - .pg_name =3D "nfsacl", > - .pg_class =3D "nfsd", > - .pg_authenticate =3D &svc_set_client, > - .pg_init_request =3D nfsd_acl_init_request, > - .pg_rpcbind_set =3D nfsd_acl_rpcbind_set, > -}; > - You just added this code in patch 11. I think it'd be clearer to reverse the order of patches 11 and 12. That way you don't have this interim version of the localio program that lives on the linked list. > =C2=A0#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL= ) */ > =C2=A0 > =C2=A0static const struct svc_version *nfsd_version[NFSD_MAXVERS+1] =3D { > @@ -138,22 +113,41 @@ static const struct svc_version *nfsd_version[NFSD_= MAXVERS+1] =3D { > =C2=A0#endif > =C2=A0}; > =C2=A0 > -struct svc_program nfsd_program =3D { > -#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) > - .pg_next =3D &nfsd_acl_program, > -#else > -#if IS_ENABLED(CONFIG_NFSD_LOCALIO) > - .pg_next =3D &nfsd_localio_program, > -#endif /* CONFIG_NFSD_LOCALIO */ > -#endif > +struct svc_program nfsd_programs[] =3D { > + { > =C2=A0 .pg_prog =3D NFS_PROGRAM, /* program number */ > =C2=A0 .pg_nvers =3D NFSD_MAXVERS+1, /* nr of entries in nfsd_version */ > =C2=A0 .pg_vers =3D nfsd_version, /* version table */ > =C2=A0 .pg_name =3D "nfsd", /* program name */ > =C2=A0 .pg_class =3D "nfsd", /* authentication class */ > - .pg_authenticate =3D &svc_set_client, /* export authentication */ > + .pg_authenticate =3D svc_set_client, /* export authentication */ > =C2=A0 .pg_init_request =3D nfsd_init_request, > =C2=A0 .pg_rpcbind_set =3D nfsd_rpcbind_set, > + }, > +#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) > + { > + .pg_prog =3D NFS_ACL_PROGRAM, > + .pg_nvers =3D NFSD_ACL_NRVERS, > + .pg_vers =3D nfsd_acl_version, > + .pg_name =3D "nfsacl", > + .pg_class =3D "nfsd", > + .pg_authenticate =3D svc_set_client, > + .pg_init_request =3D nfsd_acl_init_request, > + .pg_rpcbind_set =3D nfsd_acl_rpcbind_set, > + }, > +#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */ > +#if IS_ENABLED(CONFIG_NFSD_LOCALIO) > + { > + .pg_prog =3D NFS_LOCALIO_PROGRAM, > + .pg_nvers =3D NFSD_LOCALIO_NRVERS, > + .pg_vers =3D localio_versions, > + .pg_name =3D "nfslocalio", > + .pg_class =3D "nfsd", > + .pg_authenticate =3D svc_set_client, > + .pg_init_request =3D svc_generic_init_request, > + .pg_rpcbind_set =3D svc_generic_rpcbind_set, > + } > +#endif /* IS_ENABLED(CONFIG_NFSD_LOCALIO) */ > =C2=A0}; > =C2=A0 > =C2=A0bool nfsd_support_version(int vers) > @@ -663,7 +657,8 @@ int nfsd_create_serv(struct net *net) > =C2=A0 if (nfsd_max_blksize =3D=3D 0) > =C2=A0 nfsd_max_blksize =3D nfsd_get_default_max_blksize(); > =C2=A0 nfsd_reset_versions(nn); > - serv =3D svc_create_pooled(&nfsd_program, &nn->nfsd_svcstats, > + serv =3D svc_create_pooled(nfsd_programs, ARRAY_SIZE(nfsd_programs), > + &nn->nfsd_svcstats, > =C2=A0 nfsd_max_blksize, nfsd); > =C2=A0 if (serv =3D=3D NULL) > =C2=A0 return -ENOMEM; > diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h > index 437672bcaa22..c7ad2fb2a155 100644 > --- a/include/linux/sunrpc/svc.h > +++ b/include/linux/sunrpc/svc.h > @@ -67,9 +67,10 @@ enum { > =C2=A0 * We currently do not support more than one RPC program per daemon= . > =C2=A0 */ > =C2=A0struct svc_serv { > - struct svc_program * sv_program; /* RPC program */ > + struct svc_program * sv_programs; /* RPC programs */ > =C2=A0 struct svc_stat * sv_stats; /* RPC statistics */ > =C2=A0 spinlock_t sv_lock; > + unsigned int sv_nprogs; /* Number of sv_programs */ > =C2=A0 unsigned int sv_nrthreads; /* # of server threads */ > =C2=A0 unsigned int sv_maxconn; /* max connections allowed or > =C2=A0 * '0' causing max to be based > @@ -357,10 +358,9 @@ struct svc_process_info { > =C2=A0}; > =C2=A0 > =C2=A0/* > - * List of RPC programs on the same transport endpoint > + * RPC program - an array of these can use the same transport endpoint > =C2=A0 */ > =C2=A0struct svc_program { > - struct svc_program * pg_next; /* other programs (same xprt) */ > =C2=A0 u32 pg_prog; /* program number */ > =C2=A0 unsigned int pg_lovers; /* lowest version */ > =C2=A0 unsigned int pg_hivers; /* highest version */ > @@ -438,6 +438,7 @@ bool =C2=A0=C2=A0 svc_rqst_replace_page(struct svc_r= qst *rqstp, > =C2=A0void =C2=A0=C2=A0 svc_rqst_release_pages(struct svc_rqst *rqstp); > =C2=A0void =C2=A0=C2=A0 svc_exit_thread(struct svc_rqst *); > =C2=A0struct svc_serv *=C2=A0 svc_create_pooled(struct svc_program *prog, > + =C2=A0=C2=A0=C2=A0=C2=A0 unsigned int nprog, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 struct svc_stat *stats, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 unsigned int bufsize, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 int (*threadfn)(void *data)); > diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c > index ff6f3e35b36d..b33386d249c2 100644 > --- a/net/sunrpc/svc.c > +++ b/net/sunrpc/svc.c > @@ -440,10 +440,11 @@ EXPORT_SYMBOL_GPL(svc_rpcb_cleanup); > =C2=A0 > =C2=A0static int svc_uses_rpcbind(struct svc_serv *serv) > =C2=A0{ > - struct svc_program *progp; > - unsigned int i; > + unsigned int p, i; > + > + for (p =3D 0; p < serv->sv_nprogs; p++) { > + struct svc_program *progp =3D &serv->sv_programs[p]; > =C2=A0 > - for (progp =3D serv->sv_program; progp; progp =3D progp->pg_next) { > =C2=A0 for (i =3D 0; i < progp->pg_nvers; i++) { > =C2=A0 if (progp->pg_vers[i] =3D=3D NULL) > =C2=A0 continue; > @@ -480,7 +481,7 @@ __svc_init_bc(struct svc_serv *serv) > =C2=A0 * Create an RPC service > =C2=A0 */ > =C2=A0static struct svc_serv * > -__svc_create(struct svc_program *prog, struct svc_stat *stats, > +__svc_create(struct svc_program *prog, int nprogs, struct svc_stat *stat= s, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 unsigned int bufsize, int npools, int (*t= hreadfn)(void *data)) > =C2=A0{ > =C2=A0 struct svc_serv *serv; > @@ -491,7 +492,8 @@ __svc_create(struct svc_program *prog, struct svc_sta= t *stats, > =C2=A0 if (!(serv =3D kzalloc(sizeof(*serv), GFP_KERNEL))) > =C2=A0 return NULL; > =C2=A0 serv->sv_name=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D prog->pg_name; > - serv->sv_program=C2=A0=C2=A0 =3D prog; > + serv->sv_programs=C2=A0 =3D prog; > + serv->sv_nprogs=C2=A0=C2=A0=C2=A0 =3D nprogs; > =C2=A0 serv->sv_stats=C2=A0=C2=A0=C2=A0=C2=A0 =3D stats; > =C2=A0 if (bufsize > RPCSVC_MAXPAYLOAD) > =C2=A0 bufsize =3D RPCSVC_MAXPAYLOAD; > @@ -499,17 +501,18 @@ __svc_create(struct svc_program *prog, struct svc_s= tat *stats, > =C2=A0 serv->sv_max_mesg=C2=A0 =3D roundup(serv->sv_max_payload + PAGE_SI= ZE, PAGE_SIZE); > =C2=A0 serv->sv_threadfn =3D threadfn; > =C2=A0 xdrsize =3D 0; > - while (prog) { > - prog->pg_lovers =3D prog->pg_nvers-1; > - for (vers=3D0; verspg_nvers ; vers++) > - if (prog->pg_vers[vers]) { > - prog->pg_hivers =3D vers; > - if (prog->pg_lovers > vers) > - prog->pg_lovers =3D vers; > - if (prog->pg_vers[vers]->vs_xdrsize > xdrsize) > - xdrsize =3D prog->pg_vers[vers]->vs_xdrsize; > + for (i =3D 0; i < nprogs; i++) { > + struct svc_program *progp =3D &prog[i]; > + > + progp->pg_lovers =3D progp->pg_nvers-1; > + for (vers =3D 0; vers < progp->pg_nvers ; vers++) > + if (progp->pg_vers[vers]) { > + progp->pg_hivers =3D vers; > + if (progp->pg_lovers > vers) > + progp->pg_lovers =3D vers; > + if (progp->pg_vers[vers]->vs_xdrsize > xdrsize) > + xdrsize =3D progp->pg_vers[vers]->vs_xdrsize; > =C2=A0 } > - prog =3D prog->pg_next; > =C2=A0 } > =C2=A0 serv->sv_xdrsize=C2=A0=C2=A0 =3D xdrsize; > =C2=A0 INIT_LIST_HEAD(&serv->sv_tempsocks); > @@ -558,13 +561,14 @@ __svc_create(struct svc_program *prog, struct svc_s= tat *stats, > =C2=A0struct svc_serv *svc_create(struct svc_program *prog, unsigned int = bufsize, > =C2=A0 =C2=A0=C2=A0=C2=A0 int (*threadfn)(void *data)) > =C2=A0{ > - return __svc_create(prog, NULL, bufsize, 1, threadfn); > + return __svc_create(prog, 1, NULL, bufsize, 1, threadfn); > =C2=A0} > =C2=A0EXPORT_SYMBOL_GPL(svc_create); > =C2=A0 > =C2=A0/** > =C2=A0 * svc_create_pooled - Create an RPC service with pooled threads > - * @prog: the RPC program the new service will handle > + * @prog:=C2=A0 Array of RPC programs the new service will handle > + * @nprogs: Number of programs in the array > =C2=A0 * @stats: the stats struct if desired > =C2=A0 * @bufsize: maximum message size for @prog > =C2=A0 * @threadfn: a function to service RPC requests for @prog > @@ -572,6 +576,7 @@ EXPORT_SYMBOL_GPL(svc_create); > =C2=A0 * Returns an instantiated struct svc_serv object or NULL. > =C2=A0 */ > =C2=A0struct svc_serv *svc_create_pooled(struct svc_program *prog, > + =C2=A0=C2=A0 unsigned int nprogs, > =C2=A0 =C2=A0=C2=A0 struct svc_stat *stats, > =C2=A0 =C2=A0=C2=A0 unsigned int bufsize, > =C2=A0 =C2=A0=C2=A0 int (*threadfn)(void *data)) > @@ -579,7 +584,7 @@ struct svc_serv *svc_create_pooled(struct svc_program= *prog, > =C2=A0 struct svc_serv *serv; > =C2=A0 unsigned int npools =3D svc_pool_map_get(); > =C2=A0 > - serv =3D __svc_create(prog, stats, bufsize, npools, threadfn); > + serv =3D __svc_create(prog, nprogs, stats, bufsize, npools, threadfn); > =C2=A0 if (!serv) > =C2=A0 goto out_err; > =C2=A0 serv->sv_is_pooled =3D true; > @@ -602,16 +607,16 @@ svc_destroy(struct svc_serv **servp) > =C2=A0 > =C2=A0 *servp =3D NULL; > =C2=A0 > - dprintk("svc: svc_destroy(%s)\n", serv->sv_program->pg_name); > + dprintk("svc: svc_destroy(%s)\n", serv->sv_programs->pg_name); > =C2=A0 timer_shutdown_sync(&serv->sv_temptimer); > =C2=A0 > =C2=A0 /* > =C2=A0 * Remaining transports at this point are not expected. > =C2=A0 */ > =C2=A0 WARN_ONCE(!list_empty(&serv->sv_permsocks), > - =C2=A0 "SVC: permsocks remain for %s\n", serv->sv_program->pg_name); > + =C2=A0 "SVC: permsocks remain for %s\n", serv->sv_programs->pg_name); > =C2=A0 WARN_ONCE(!list_empty(&serv->sv_tempsocks), > - =C2=A0 "SVC: tempsocks remain for %s\n", serv->sv_program->pg_name); > + =C2=A0 "SVC: tempsocks remain for %s\n", serv->sv_programs->pg_name); > =C2=A0 > =C2=A0 cache_clean_deferred(serv); > =C2=A0 > @@ -1149,15 +1154,16 @@ int svc_register(const struct svc_serv *serv, str= uct net *net, > =C2=A0 const int family, const unsigned short proto, > =C2=A0 const unsigned short port) > =C2=A0{ > - struct svc_program *progp; > - unsigned int i; > + unsigned int p, i; > =C2=A0 int error =3D 0; > =C2=A0 > =C2=A0 WARN_ON_ONCE(proto =3D=3D 0 && port =3D=3D 0); > =C2=A0 if (proto =3D=3D 0 && port =3D=3D 0) > =C2=A0 return -EINVAL; > =C2=A0 > - for (progp =3D serv->sv_program; progp; progp =3D progp->pg_next) { > + for (p =3D 0; p < serv->sv_nprogs; p++) { > + struct svc_program *progp =3D &serv->sv_programs[p]; > + > =C2=A0 for (i =3D 0; i < progp->pg_nvers; i++) { > =C2=A0 > =C2=A0 error =3D progp->pg_rpcbind_set(net, progp, i, > @@ -1209,13 +1215,14 @@ static void __svc_unregister(struct net *net, con= st u32 program, const u32 versi > =C2=A0static void svc_unregister(const struct svc_serv *serv, struct net = *net) > =C2=A0{ > =C2=A0 struct sighand_struct *sighand; > - struct svc_program *progp; > =C2=A0 unsigned long flags; > - unsigned int i; > + unsigned int p, i; > =C2=A0 > =C2=A0 clear_thread_flag(TIF_SIGPENDING); > =C2=A0 > - for (progp =3D serv->sv_program; progp; progp =3D progp->pg_next) { > + for (p =3D 0; p < serv->sv_nprogs; p++) { > + struct svc_program *progp =3D &serv->sv_programs[p]; > + > =C2=A0 for (i =3D 0; i < progp->pg_nvers; i++) { > =C2=A0 if (progp->pg_vers[i] =3D=3D NULL) > =C2=A0 continue; > @@ -1321,7 +1328,7 @@ svc_process_common(struct svc_rqst *rqstp) > =C2=A0 struct svc_process_info process; > =C2=A0 enum svc_auth_status auth_res; > =C2=A0 unsigned int aoffset; > - int rc; > + int pr, rc; > =C2=A0 __be32 *p; > =C2=A0 > =C2=A0 /* Will be turned off only when NFSv4 Sessions are used */ > @@ -1345,9 +1352,12 @@ svc_process_common(struct svc_rqst *rqstp) > =C2=A0 rqstp->rq_vers =3D be32_to_cpup(p++); > =C2=A0 rqstp->rq_proc =3D be32_to_cpup(p); > =C2=A0 > - for (progp =3D serv->sv_program; progp; progp =3D progp->pg_next) > + for (pr =3D 0; pr < serv->sv_nprogs; pr++) { > + progp =3D &serv->sv_programs[pr]; > + > =C2=A0 if (rqstp->rq_prog =3D=3D progp->pg_prog) > =C2=A0 break; > + } > =C2=A0 > =C2=A0 /* > =C2=A0 * Decode auth data, and add verifier to reply buffer. > diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c > index 53ebc719ff5a..43c57124de52 100644 > --- a/net/sunrpc/svc_xprt.c > +++ b/net/sunrpc/svc_xprt.c > @@ -268,7 +268,7 @@ static int _svc_xprt_create(struct svc_serv *serv, co= nst char *xprt_name, > =C2=A0 spin_unlock(&svc_xprt_class_lock); > =C2=A0 newxprt =3D xcl->xcl_ops->xpo_create(serv, net, sap, len, flags); > =C2=A0 if (IS_ERR(newxprt)) { > - trace_svc_xprt_create_err(serv->sv_program->pg_name, > + trace_svc_xprt_create_err(serv->sv_programs->pg_name, > =C2=A0 =C2=A0 xcl->xcl_name, sap, len, > =C2=A0 =C2=A0 newxprt); > =C2=A0 module_put(xcl->xcl_owner); > diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c > index 04b45588ae6f..8ca98b146ec8 100644 > --- a/net/sunrpc/svcauth_unix.c > +++ b/net/sunrpc/svcauth_unix.c > @@ -697,7 +697,8 @@ svcauth_unix_set_client(struct svc_rqst *rqstp) > =C2=A0 rqstp->rq_auth_stat =3D rpc_autherr_badcred; > =C2=A0 ipm =3D ip_map_cached_get(xprt); > =C2=A0 if (ipm =3D=3D NULL) > - ipm =3D __ip_map_lookup(sn->ip_map_cache, rqstp->rq_server->sv_program= ->pg_class, > + ipm =3D __ip_map_lookup(sn->ip_map_cache, > + =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rqstp->rq_server->sv_programs->pg_cla= ss, > =C2=A0 =C2=A0=C2=A0=C2=A0 &sin6->sin6_addr); > =C2=A0 > =C2=A0 if (ipm =3D=3D NULL) --=20 Jeff Layton