Clean up: Use the "svc_xprt_<task>" function naming convention as is used for other external APIs.
Unified · Split
| @@ -197,8 +197,8 @@ static int create_lockd_listener(struct svc_serv *serv, const char *name, · 196 unmodified lines | ||
| 197 | 197 | |
| 198 | 198 | xprt = svc_find_xprt(serv, name, net, family, 0); |
| 199 | 199 | if (xprt == NULL) |
| 200 | − return svc_create_xprt(serv, name, net, family, port, | |
| 201 | − SVC_SOCK_DEFAULTS, cred); | |
| 200 | + return svc_xprt_create(serv, name, net, family, port, | |
| 201 | + SVC_SOCK_DEFAULTS, cred); | |
| 202 | 202 | svc_xprt_put(xprt); |
| 203 | 203 | return 0; |
| 204 | 204 | } |
| @@ -45,18 +45,18 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) · 44 unmodified lines | ||
| 45 | 45 | int ret; |
| 46 | 46 | struct nfs_net *nn = net_generic(net, nfs_net_id); |
| 47 | 47 | |
| 48 | − ret = svc_create_xprt(serv, "tcp", net, PF_INET, | |
| 49 | − nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS, | |
| 50 | − cred); | |
| 48 | + ret = svc_xprt_create(serv, "tcp", net, PF_INET, | |
| 49 | + nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS, | |
| 50 | + cred); | |
| 51 | 51 | if (ret <= 0) |
| 52 | 52 | goto out_err; |
| 53 | 53 | nn->nfs_callback_tcpport = ret; |
| 54 | 54 | dprintk("NFS: Callback listener port = %u (af %u, net %x)\n", |
| 55 | 55 | nn->nfs_callback_tcpport, PF_INET, net->ns.inum); |
| 56 | 56 | |
| 57 | − ret = svc_create_xprt(serv, "tcp", net, PF_INET6, | |
| 58 | − nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS, | |
| 59 | − cred); | |
| 57 | + ret = svc_xprt_create(serv, "tcp", net, PF_INET6, | |
| 58 | + nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS, | |
| 59 | + cred); | |
| 60 | 60 | if (ret > 0) { |
| 61 | 61 | nn->nfs_callback_tcpport6 = ret; |
| 62 | 62 | dprintk("NFS: Callback listener port = %u (af %u, net %x)\n", |
| @@ -772,13 +772,13 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr · 771 unmodified lines | ||
| 772 | 772 | if (err != 0) |
| 773 | 773 | return err; |
| 774 | 774 | |
| 775 | − err = svc_create_xprt(nn->nfsd_serv, transport, net, | |
| 776 | − PF_INET, port, SVC_SOCK_ANONYMOUS, cred); | |
| 775 | + err = svc_xprt_create(nn->nfsd_serv, transport, net, | |
| 776 | + PF_INET, port, SVC_SOCK_ANONYMOUS, cred); | |
| 777 | 777 | if (err < 0) |
| 778 | 778 | goto out_err; |
| 779 | 779 | |
| 780 | − err = svc_create_xprt(nn->nfsd_serv, transport, net, | |
| 781 | − PF_INET6, port, SVC_SOCK_ANONYMOUS, cred); | |
| 780 | + err = svc_xprt_create(nn->nfsd_serv, transport, net, | |
| 781 | + PF_INET6, port, SVC_SOCK_ANONYMOUS, cred); | |
| 782 | 782 | if (err < 0 && err != -EAFNOSUPPORT) |
| 783 | 783 | goto out_close; |
| 784 | 784 | |
| @@ -293,13 +293,13 @@ static int nfsd_init_socks(struct net *net, const struct cred *cred) · 292 unmodified lines | ||
| 293 | 293 | if (!list_empty(&nn->nfsd_serv->sv_permsocks)) |
| 294 | 294 | return 0; |
| 295 | 295 | |
| 296 | − error = svc_create_xprt(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT, | |
| 297 | − SVC_SOCK_DEFAULTS, cred); | |
| 296 | + error = svc_xprt_create(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT, | |
| 297 | + SVC_SOCK_DEFAULTS, cred); | |
| 298 | 298 | if (error < 0) |
| 299 | 299 | return error; |
| 300 | 300 | |
| 301 | − error = svc_create_xprt(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT, | |
| 302 | − SVC_SOCK_DEFAULTS, cred); | |
| 301 | + error = svc_xprt_create(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT, | |
| 302 | + SVC_SOCK_DEFAULTS, cred); | |
| 303 | 303 | if (error < 0) |
| 304 | 304 | return error; |
| 305 | 305 | |
| @@ -127,9 +127,10 @@ int svc_reg_xprt_class(struct svc_xprt_class *); · 126 unmodified lines | ||
| 127 | 127 | void svc_unreg_xprt_class(struct svc_xprt_class *); |
| 128 | 128 | void svc_xprt_init(struct net *, struct svc_xprt_class *, struct svc_xprt *, |
| 129 | 129 | struct svc_serv *); |
| 130 | −int svc_create_xprt(struct svc_serv *, const char *, struct net *, | |
| 131 | − const int, const unsigned short, int, | |
| 132 | − const struct cred *); | |
| 130 | +int svc_xprt_create(struct svc_serv *serv, const char *xprt_name, | |
| 131 | + struct net *net, const int family, | |
| 132 | + const unsigned short port, int flags, | |
| 133 | + const struct cred *cred); | |
| 133 | 134 | void svc_xprt_received(struct svc_xprt *xprt); |
| 134 | 135 | void svc_xprt_enqueue(struct svc_xprt *xprt); |
| 135 | 136 | void svc_xprt_put(struct svc_xprt *xprt); |
| @@ -285,7 +285,7 @@ void svc_add_new_perm_xprt(struct svc_serv *serv, struct svc_xprt *new) · 284 unmodified lines | ||
| 285 | 285 | svc_xprt_received(new); |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | −static int _svc_create_xprt(struct svc_serv *serv, const char *xprt_name, | |
| 288 | +static int _svc_xprt_create(struct svc_serv *serv, const char *xprt_name, | |
| 289 | 289 | struct net *net, const int family, |
| 290 | 290 | const unsigned short port, int flags, |
| 291 | 291 | const struct cred *cred) |
| @@ -321,21 +321,35 @@ static int _svc_create_xprt(struct svc_serv *serv, const char *xprt_name, · 29 unmodified lines | ||
| 321 | 321 | return -EPROTONOSUPPORT; |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | −int svc_create_xprt(struct svc_serv *serv, const char *xprt_name, | |
| 324 | +/** | |
| 325 | + * svc_xprt_create - Add a new listener to @serv | |
| 326 | + * @serv: target RPC service | |
| 327 | + * @xprt_name: transport class name | |
| 328 | + * @net: network namespace | |
| 329 | + * @family: network address family | |
| 330 | + * @port: listener port | |
| 331 | + * @flags: SVC_SOCK flags | |
| 332 | + * @cred: credential to bind to this transport | |
| 333 | + * | |
| 334 | + * Return values: | |
| 335 | + * %0: New listener added successfully | |
| 336 | + * %-EPROTONOSUPPORT: Requested transport type not supported | |
| 337 | + */ | |
| 338 | +int svc_xprt_create(struct svc_serv *serv, const char *xprt_name, | |
| 325 | 339 | struct net *net, const int family, |
| 326 | 340 | const unsigned short port, int flags, |
| 327 | 341 | const struct cred *cred) |
| 328 | 342 | { |
| 329 | 343 | int err; |
| 330 | 344 | |
| 331 | − err = _svc_create_xprt(serv, xprt_name, net, family, port, flags, cred); | |
| 345 | + err = _svc_xprt_create(serv, xprt_name, net, family, port, flags, cred); | |
| 332 | 346 | if (err == -EPROTONOSUPPORT) { |
| 333 | 347 | request_module("svc%s", xprt_name); |
| 334 | − err = _svc_create_xprt(serv, xprt_name, net, family, port, flags, cred); | |
| 348 | + err = _svc_xprt_create(serv, xprt_name, net, family, port, flags, cred); | |
| 335 | 349 | } |
| 336 | 350 | return err; |
| 337 | 351 | } |
| 338 | −EXPORT_SYMBOL_GPL(svc_create_xprt); | |
| 352 | +EXPORT_SYMBOL_GPL(svc_xprt_create); | |
| 339 | 353 | |
| 340 | 354 | /* |
| 341 | 355 | * Copy the local and remote xprt addresses to the rqstp structure |