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

Commit bc5fea42 authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds
Browse files

[PATCH] knfsd: register all RPC programs with portmapper by default 



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: default avatarOlaf Kirch <okir@suse.de>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0ade060e

fs/nfsd/nfs2acl.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

};

fs/nfsd/nfs3acl.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

};

include/linux/sunrpc/svc.h

+3 −0
Original line number Diff line number Diff line
@@ -321,6 +321,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.

net/sunrpc/svc.c

+23 −14
Original line number Diff line number Diff line
@@ -644,17 +644,25 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port) 
	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 (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;
@@ -663,6 +671,7 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port) 
				break;

			}

		}

	}



	if (!port) {

		spin_lock_irqsave(&current->sighand->siglock, flags);