Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751096AbWIANZe (ORCPT ); Fri, 1 Sep 2006 09:25:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751113AbWIANZe (ORCPT ); Fri, 1 Sep 2006 09:25:34 -0400 Received: from mx1.redhat.com ([66.187.233.31]:18362 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S1751096AbWIANZd (ORCPT ); Fri, 1 Sep 2006 09:25:33 -0400 Message-ID: <44F834B6.9060507@redhat.com> Date: Fri, 01 Sep 2006 09:25:10 -0400 From: Peter Staubach User-Agent: Thunderbird 1.5.0.5 (X11/20060801) MIME-Version: 1.0 To: NeilBrown CC: Andrew Morton , Olaf Kirch , nfs@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [NFS] [PATCH 019 of 19] knfsd: Register all RPC programs with portmapper by default References: <20060901141639.27206.patches@notabene> <1060901043948.27677@suse.de> In-Reply-To: <1060901043948.27677@suse.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4133 Lines: 119 NeilBrown wrote: > From: Olaf Kirch > > The NFSACL patches introduced support for multiple RPC services > listening on the same transport. However, only the first of these > services was registered with portmapper. This was perfectly fine > for nfsacl, as you traditionally do not want these to show up in a > portmapper listing. > > The patch below changes the default behavior to always register > all services listening on a given transport, but retains the > old behavior for nfsacl services. > > Signed-off-by: Olaf Kirch > Signed-off-by: Neil Brown > > ### Diffstat output > ./fs/nfsd/nfs2acl.c | 1 + > ./fs/nfsd/nfs3acl.c | 1 + > ./include/linux/sunrpc/svc.h | 3 +++ > ./net/sunrpc/svc.c | 37 +++++++++++++++++++++++-------------- > 4 files changed, 28 insertions(+), 14 deletions(-) > > diff .prev/fs/nfsd/nfs2acl.c ./fs/nfsd/nfs2acl.c > --- .prev/fs/nfsd/nfs2acl.c 2006-09-01 12:22:10.000000000 +1000 > +++ ./fs/nfsd/nfs2acl.c 2006-09-01 12:22:11.000000000 +1000 > @@ -333,4 +333,5 @@ struct svc_version nfsd_acl_version2 = { > .vs_proc = nfsd_acl_procedures2, > .vs_dispatch = nfsd_dispatch, > .vs_xdrsize = NFS3_SVC_XDRSIZE, > + .vs_hidden = 1, > }; > > diff .prev/fs/nfsd/nfs3acl.c ./fs/nfsd/nfs3acl.c > --- .prev/fs/nfsd/nfs3acl.c 2006-09-01 12:22:10.000000000 +1000 > +++ ./fs/nfsd/nfs3acl.c 2006-09-01 12:22:11.000000000 +1000 > @@ -263,5 +263,6 @@ struct svc_version nfsd_acl_version3 = { > .vs_proc = nfsd_acl_procedures3, > .vs_dispatch = nfsd_dispatch, > .vs_xdrsize = NFS3_SVC_XDRSIZE, > + .vs_hidden = 1, > }; > > > diff .prev/include/linux/sunrpc/svc.h ./include/linux/sunrpc/svc.h > --- .prev/include/linux/sunrpc/svc.h 2006-09-01 12:22:10.000000000 +1000 > +++ ./include/linux/sunrpc/svc.h 2006-09-01 12:22:11.000000000 +1000 > @@ -304,6 +304,9 @@ struct svc_version { > struct svc_procedure * vs_proc; /* per-procedure info */ > u32 vs_xdrsize; /* xdrsize needed for this version */ > > + unsigned int vs_hidden : 1; /* Don't register with portmapper. > + * Only used for nfsacl so far. */ > + > /* Override dispatch function (e.g. when caching replies). > * A return value of 0 means drop the request. > * vs_dispatch == NULL means use default dispatcher. > > diff .prev/net/sunrpc/svc.c ./net/sunrpc/svc.c > --- .prev/net/sunrpc/svc.c 2006-09-01 12:22:11.000000000 +1000 > +++ ./net/sunrpc/svc.c 2006-09-01 12:22:11.000000000 +1000 > @@ -644,23 +644,32 @@ svc_register(struct svc_serv *serv, int > unsigned long flags; > int i, error = 0, dummy; > > - progp = serv->sv_program; > - > - dprintk("RPC: svc_register(%s, %s, %d)\n", > - progp->pg_name, proto == IPPROTO_UDP? "udp" : "tcp", port); > - > if (!port) > clear_thread_flag(TIF_SIGPENDING); > > - for (i = 0; i < progp->pg_nvers; i++) { > - if (progp->pg_vers[i] == NULL) > - continue; > - error = rpc_register(progp->pg_prog, i, proto, port, &dummy); > - if (error < 0) > - break; > - if (port && !dummy) { > - error = -EACCES; > - break; > + for (progp = serv->sv_program; progp; progp = progp->pg_next) { > + for (i = 0; i < progp->pg_nvers; i++) { > + if (progp->pg_vers[i] == NULL) > + continue; > + > + dprintk("RPC: svc_register(%s, %s, %d, %d)%s\n", > + progp->pg_name, > + proto == IPPROTO_UDP? "udp" : "tcp", > + port, > + i, > + progp->pg_vers[i]->vs_hidden? > + " (but not telling portmap)" : ""); > + > + if (progp->pg_vers[i]->vs_hidden) > + continue; > + > + error = rpc_register(progp->pg_prog, i, proto, port, &dummy); > + if (error < 0) > + break; > + if (port && !dummy) { > + error = -EACCES; > + break; > + } > } > } Just out of curiosity, why does the dprintk say "svc_register", but the code calls rpc_register? Thanx... ps - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/