svc: Add svc API that queries for a transport instance

Add a new svc function that allows a service to query whether a
transport instance has already been created. This is used in lockd
to determine whether or not a transport needs to be created when
a lockd instance is brought up.

Specifying 0 for the address family or port is effectively a wild-card,
and will result in matching the first transport in the service's list
that has a matching class name.

Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
Acked-by: Neil Brown <neilb@suse.de>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Greg Banks <gnb@sgi.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

1 files changed, 2 insertions, 14 deletions

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index a8e79a907202..470af0138bb5 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -219,18 +219,6 @@ lockd(struct svc_rqst *rqstp)
         module_put_and_exit(0);
 }
 
-static int find_xprt(struct svc_serv *serv, char *proto)
-{
-        struct svc_xprt *xprt;
-        int found = 0;
-        list_for_each_entry(xprt, &serv->sv_permsocks, xpt_list)
-                if (strcmp(xprt->xpt_class->xcl_name, proto) == 0) {
-                        found = 1;
-                        break;
-                }
-        return found;
-}
-
 /*
  * Make any sockets that are needed but not present.
  * If nlm_udpport or nlm_tcpport were set as module
@@ -242,11 +230,11 @@ static int make_socks(struct svc_serv *serv, int proto)
         int err = 0;
 
         if (proto == IPPROTO_UDP || nlm_udpport)
-                if (!find_xprt(serv, "udp"))
+                if (!svc_find_xprt(serv, "udp", 0, 0))
                         err = svc_create_xprt(serv, "udp", nlm_udpport,
                                               SVC_SOCK_DEFAULTS);
         if (err >= 0 && (proto == IPPROTO_TCP || nlm_tcpport))
-                if (!find_xprt(serv, "tcp"))
+                if (!svc_find_xprt(serv, "tcp", 0, 0))
                         err = svc_create_xprt(serv, "tcp", nlm_tcpport,
                                               SVC_SOCK_DEFAULTS);