3 files changed, 38 insertions, 1 deletions
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index d926fd1a5313..ad09bed239fc 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -136,6 +136,8 @@ void		rpc_shutdown_client(struct rpc_clnt *);
 void            rpc_release_client(struct rpc_clnt *);
 void            rpc_task_release_client(struct rpc_task *);
+int             rpcb_create_local(void);
+void            rpcb_put_local(void);
 int             rpcb_register(u32, u32, int, unsigned short);
 int             rpcb_v4_register(const u32 program, const u32 version,
                                 const struct sockaddr *address,
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index f5309aba1a14..c24626537a7d 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -320,7 +320,7 @@ out:
 * Returns zero on success, otherwise a negative errno value
 * is returned.
 */
-static int rpcb_create_local(void)
+int rpcb_create_local(void)
 {
        static DEFINE_MUTEX(rpcb_create_local_mutex);
        int result = 0;
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 6a69a1131fb7..d2d61bfa3306 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -354,6 +354,41 @@ svc_pool_for_cpu(struct svc_serv *serv, int cpu)
        return &serv->sv_pools[pidx % serv->sv_nrpools];
 }
+static int svc_rpcb_setup(struct svc_serv *serv)
+{
+        int err;
+        err = rpcb_create_local();
+        if (err)
+                return err;
+        /* Remove any stale portmap registrations */
+        svc_unregister(serv);
+        return 0;
+}
+static void svc_rpcb_cleanup(struct svc_serv *serv)
+{
+        svc_unregister(serv);
+        rpcb_put_local();
+}
+static int svc_uses_rpcbind(struct svc_serv *serv)
+{
+        struct svc_program      *progp;
+        unsigned int            i;
+        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;
+                        if (progp->pg_vers[i]->vs_hidden == 0)
+                                return 1;
+                }
+        }
+        return 0;
+}
 /*
 * Create an RPC service

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index d926fd1a5313..ad09bed239fc 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h
@@ -136,6 +136,8 @@ void rpc_shutdown_client(struct rpc_clnt *);
136	void rpc_release_client(struct rpc_clnt *);	136	void rpc_release_client(struct rpc_clnt *);
137	void rpc_task_release_client(struct rpc_task *);	137	void rpc_task_release_client(struct rpc_task *);
138		138
		139	int rpcb_create_local(void);
		140	void rpcb_put_local(void);
139	int rpcb_register(u32, u32, int, unsigned short);	141	int rpcb_register(u32, u32, int, unsigned short);
140	int rpcb_v4_register(const u32 program, const u32 version,	142	int rpcb_v4_register(const u32 program, const u32 version,
141	const struct sockaddr *address,	143	const struct sockaddr *address,


diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index f5309aba1a14..c24626537a7d 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c
@@ -320,7 +320,7 @@ out:
320	* Returns zero on success, otherwise a negative errno value	320	* Returns zero on success, otherwise a negative errno value
321	* is returned.	321	* is returned.
322	*/	322	*/
323	static int rpcb_create_local(void)	323	int rpcb_create_local(void)
324	{	324	{
325	static DEFINE_MUTEX(rpcb_create_local_mutex);	325	static DEFINE_MUTEX(rpcb_create_local_mutex);
326	int result = 0;	326	int result = 0;


diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 6a69a1131fb7..d2d61bfa3306 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c
@@ -354,6 +354,41 @@ svc_pool_for_cpu(struct svc_serv *serv, int cpu)
354	return &serv->sv_pools[pidx % serv->sv_nrpools];	354	return &serv->sv_pools[pidx % serv->sv_nrpools];
355	}	355	}
356		356
		357	static int svc_rpcb_setup(struct svc_serv *serv)
		358	{
		359	int err;
		360
		361	err = rpcb_create_local();
		362	if (err)
		363	return err;
		364
		365	/* Remove any stale portmap registrations */
		366	svc_unregister(serv);
		367	return 0;
		368	}
		369
		370	static void svc_rpcb_cleanup(struct svc_serv *serv)
		371	{
		372	svc_unregister(serv);
		373	rpcb_put_local();
		374	}
		375
		376	static int svc_uses_rpcbind(struct svc_serv *serv)
		377	{
		378	struct svc_program *progp;
		379	unsigned int i;
		380
		381	for (progp = serv->sv_program; progp; progp = progp->pg_next) {
		382	for (i = 0; i < progp->pg_nvers; i++) {
		383	if (progp->pg_vers[i] == NULL)
		384	continue;
		385	if (progp->pg_vers[i]->vs_hidden == 0)
		386	return 1;
		387	}
		388	}
		389
		390	return 0;
		391	}
357		392
358	/*	393	/*
359	* Create an RPC service	394	* Create an RPC service