SUNRPC: Rename svc_create_xprt()

Clean up: Use the "svc_xprt_<task>" function naming convention as
is used for other external APIs.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index f5b688a844aa535ed05764fbac74f00aa74dc6b6..bba6f2b45b64abe426a2f768a9709750682526dd 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -197,8 +197,8 @@ static int create_lockd_listener(struct svc_serv *serv, const char *name,
 
        xprt = svc_find_xprt(serv, name, net, family, 0);
        if (xprt == NULL)
-               return svc_create_xprt(serv, name, net, family, port,
-                                               SVC_SOCK_DEFAULTS, cred);
+               return svc_xprt_create(serv, name, net, family, port,
+                                      SVC_SOCK_DEFAULTS, cred);
        svc_xprt_put(xprt);
        return 0;
 }

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 7a810f885063245a20df5f51c95f743b918354cb..c1a8767100ae9716abaf3d012928806ce32e09b7 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -45,18 +45,18 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net)
        int ret;
        struct nfs_net *nn = net_generic(net, nfs_net_id);
 
-       ret = svc_create_xprt(serv, "tcp", net, PF_INET,
-                               nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,
-                               cred);
+       ret = svc_xprt_create(serv, "tcp", net, PF_INET,
+                             nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,
+                             cred);
        if (ret <= 0)
                goto out_err;
        nn->nfs_callback_tcpport = ret;
        dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",
                nn->nfs_callback_tcpport, PF_INET, net->ns.inum);
 
-       ret = svc_create_xprt(serv, "tcp", net, PF_INET6,
-                               nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,
-                               cred);
+       ret = svc_xprt_create(serv, "tcp", net, PF_INET6,
+                             nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,
+                             cred);
        if (ret > 0) {
                nn->nfs_callback_tcpport6 = ret;
                dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 68b020f2002b7cda75bf371ca620ffb3d06e129b..8fec779994f7b50c92bf122dc5dc07de5fbea0e4 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -772,13 +772,13 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
        if (err != 0)
                return err;
 
-       err = svc_create_xprt(nn->nfsd_serv, transport, net,
-                               PF_INET, port, SVC_SOCK_ANONYMOUS, cred);
+       err = svc_xprt_create(nn->nfsd_serv, transport, net,
+                             PF_INET, port, SVC_SOCK_ANONYMOUS, cred);
        if (err < 0)
                goto out_err;
 
-       err = svc_create_xprt(nn->nfsd_serv, transport, net,
-                               PF_INET6, port, SVC_SOCK_ANONYMOUS, cred);
+       err = svc_xprt_create(nn->nfsd_serv, transport, net,
+                             PF_INET6, port, SVC_SOCK_ANONYMOUS, cred);
        if (err < 0 && err != -EAFNOSUPPORT)
                goto out_close;
 

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 0c6b216e439ec57b294b7c6d185d701d9a500c9d..ae25b7b3af99e57a56c8771b7115fec84864f141 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -293,13 +293,13 @@ static int nfsd_init_socks(struct net *net, const struct cred *cred)
        if (!list_empty(&nn->nfsd_serv->sv_permsocks))
                return 0;
 
-       error = svc_create_xprt(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT,
-                                       SVC_SOCK_DEFAULTS, cred);
+       error = svc_xprt_create(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT,
+                               SVC_SOCK_DEFAULTS, cred);
        if (error < 0)
                return error;
 
-       error = svc_create_xprt(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT,
-                                       SVC_SOCK_DEFAULTS, cred);
+       error = svc_xprt_create(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT,
+                               SVC_SOCK_DEFAULTS, cred);
        if (error < 0)
                return error;
 

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index a3ba027fb4ba7cc1e75eeb1944717c5c0845e679..a7f6f17c3dc5ecc173bbff7926f414e5380a5be1 100644 (file)
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -127,9 +127,10 @@ int        svc_reg_xprt_class(struct svc_xprt_class *);
 void   svc_unreg_xprt_class(struct svc_xprt_class *);
 void   svc_xprt_init(struct net *, struct svc_xprt_class *, struct svc_xprt *,
                      struct svc_serv *);
-int    svc_create_xprt(struct svc_serv *, const char *, struct net *,
-                       const int, const unsigned short, int,
-                       const struct cred *);
+int    svc_xprt_create(struct svc_serv *serv, const char *xprt_name,
+                       struct net *net, const int family,
+                       const unsigned short port, int flags,
+                       const struct cred *cred);
 void   svc_xprt_received(struct svc_xprt *xprt);
 void   svc_xprt_enqueue(struct svc_xprt *xprt);
 void   svc_xprt_put(struct svc_xprt *xprt);

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 1c2295209d08371e696e8701c8f72a8d6fdde4f4..44be7193cd9b4bbe3291b1a1b1f9a9c09d9624bb 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -285,7 +285,7 @@ void svc_add_new_perm_xprt(struct svc_serv *serv, struct svc_xprt *new)
        svc_xprt_received(new);
 }
 
-static int _svc_create_xprt(struct svc_serv *serv, const char *xprt_name,
+static int _svc_xprt_create(struct svc_serv *serv, const char *xprt_name,
                            struct net *net, const int family,
                            const unsigned short port, int flags,
                            const struct cred *cred)
@@ -321,21 +321,35 @@ static int _svc_create_xprt(struct svc_serv *serv, const char *xprt_name,
        return -EPROTONOSUPPORT;
 }
 
-int svc_create_xprt(struct svc_serv *serv, const char *xprt_name,
+/**
+ * svc_xprt_create - Add a new listener to @serv
+ * @serv: target RPC service
+ * @xprt_name: transport class name
+ * @net: network namespace
+ * @family: network address family
+ * @port: listener port
+ * @flags: SVC_SOCK flags
+ * @cred: credential to bind to this transport
+ *
+ * Return values:
+ *   %0: New listener added successfully
+ *   %-EPROTONOSUPPORT: Requested transport type not supported
+ */
+int svc_xprt_create(struct svc_serv *serv, const char *xprt_name,
                    struct net *net, const int family,
                    const unsigned short port, int flags,
                    const struct cred *cred)
 {
        int err;
 
-       err = _svc_create_xprt(serv, xprt_name, net, family, port, flags, cred);
+       err = _svc_xprt_create(serv, xprt_name, net, family, port, flags, cred);
        if (err == -EPROTONOSUPPORT) {
                request_module("svc%s", xprt_name);
-               err = _svc_create_xprt(serv, xprt_name, net, family, port, flags, cred);
+               err = _svc_xprt_create(serv, xprt_name, net, family, port, flags, cred);
        }
        return err;
 }
-EXPORT_SYMBOL_GPL(svc_create_xprt);
+EXPORT_SYMBOL_GPL(svc_xprt_create);
 
 /*
  * Copy the local and remote xprt addresses to the rqstp structure