svc: Change services to use new svc_create_xprt service
Modify the various kernel RPC svcs to use the svc_create_xprt service. 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>
This commit is contained in:
parent
b700cbb11f
commit
d7c9f1ed97
|
@ -219,13 +219,12 @@ lockd(struct svc_rqst *rqstp)
|
||||||
module_put_and_exit(0);
|
module_put_and_exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int find_xprt(struct svc_serv *serv, char *proto)
|
||||||
static int find_socket(struct svc_serv *serv, int proto)
|
|
||||||
{
|
{
|
||||||
struct svc_sock *svsk;
|
struct svc_sock *svsk;
|
||||||
int found = 0;
|
int found = 0;
|
||||||
list_for_each_entry(svsk, &serv->sv_permsocks, sk_list)
|
list_for_each_entry(svsk, &serv->sv_permsocks, sk_list)
|
||||||
if (svsk->sk_sk->sk_protocol == proto) {
|
if (strcmp(svsk->sk_xprt.xpt_class->xcl_name, proto) == 0) {
|
||||||
found = 1;
|
found = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -243,13 +242,13 @@ static int make_socks(struct svc_serv *serv, int proto)
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
if (proto == IPPROTO_UDP || nlm_udpport)
|
if (proto == IPPROTO_UDP || nlm_udpport)
|
||||||
if (!find_socket(serv, IPPROTO_UDP))
|
if (!find_xprt(serv, "udp"))
|
||||||
err = svc_makesock(serv, IPPROTO_UDP, nlm_udpport,
|
err = svc_create_xprt(serv, "udp", nlm_udpport,
|
||||||
SVC_SOCK_DEFAULTS);
|
SVC_SOCK_DEFAULTS);
|
||||||
if (err >= 0 && (proto == IPPROTO_TCP || nlm_tcpport))
|
if (err >= 0 && (proto == IPPROTO_TCP || nlm_tcpport))
|
||||||
if (!find_socket(serv, IPPROTO_TCP))
|
if (!find_xprt(serv, "tcp"))
|
||||||
err = svc_makesock(serv, IPPROTO_TCP, nlm_tcpport,
|
err = svc_create_xprt(serv, "tcp", nlm_tcpport,
|
||||||
SVC_SOCK_DEFAULTS);
|
SVC_SOCK_DEFAULTS);
|
||||||
|
|
||||||
if (err >= 0) {
|
if (err >= 0) {
|
||||||
warned = 0;
|
warned = 0;
|
||||||
|
|
|
@ -119,8 +119,8 @@ int nfs_callback_up(void)
|
||||||
if (!serv)
|
if (!serv)
|
||||||
goto out_err;
|
goto out_err;
|
||||||
|
|
||||||
ret = svc_makesock(serv, IPPROTO_TCP, nfs_callback_set_tcpport,
|
ret = svc_create_xprt(serv, "tcp", nfs_callback_set_tcpport,
|
||||||
SVC_SOCK_ANONYMOUS);
|
SVC_SOCK_ANONYMOUS);
|
||||||
if (ret <= 0)
|
if (ret <= 0)
|
||||||
goto out_destroy;
|
goto out_destroy;
|
||||||
nfs_callback_tcpport = ret;
|
nfs_callback_tcpport = ret;
|
||||||
|
|
|
@ -236,7 +236,7 @@ static int nfsd_init_socks(int port)
|
||||||
|
|
||||||
error = lockd_up(IPPROTO_UDP);
|
error = lockd_up(IPPROTO_UDP);
|
||||||
if (error >= 0) {
|
if (error >= 0) {
|
||||||
error = svc_makesock(nfsd_serv, IPPROTO_UDP, port,
|
error = svc_create_xprt(nfsd_serv, "udp", port,
|
||||||
SVC_SOCK_DEFAULTS);
|
SVC_SOCK_DEFAULTS);
|
||||||
if (error < 0)
|
if (error < 0)
|
||||||
lockd_down();
|
lockd_down();
|
||||||
|
@ -247,7 +247,7 @@ static int nfsd_init_socks(int port)
|
||||||
#ifdef CONFIG_NFSD_TCP
|
#ifdef CONFIG_NFSD_TCP
|
||||||
error = lockd_up(IPPROTO_TCP);
|
error = lockd_up(IPPROTO_TCP);
|
||||||
if (error >= 0) {
|
if (error >= 0) {
|
||||||
error = svc_makesock(nfsd_serv, IPPROTO_TCP, port,
|
error = svc_create_xprt(nfsd_serv, "tcp", port,
|
||||||
SVC_SOCK_DEFAULTS);
|
SVC_SOCK_DEFAULTS);
|
||||||
if (error < 0)
|
if (error < 0)
|
||||||
lockd_down();
|
lockd_down();
|
||||||
|
|
|
@ -67,7 +67,6 @@ struct svc_sock {
|
||||||
/*
|
/*
|
||||||
* Function prototypes.
|
* Function prototypes.
|
||||||
*/
|
*/
|
||||||
int svc_makesock(struct svc_serv *, int, unsigned short, int flags);
|
|
||||||
void svc_force_close_socket(struct svc_sock *);
|
void svc_force_close_socket(struct svc_sock *);
|
||||||
int svc_recv(struct svc_rqst *, long);
|
int svc_recv(struct svc_rqst *, long);
|
||||||
int svc_send(struct svc_rqst *);
|
int svc_send(struct svc_rqst *);
|
||||||
|
|
|
@ -33,7 +33,6 @@ EXPORT_SYMBOL(svc_drop);
|
||||||
EXPORT_SYMBOL(svc_process);
|
EXPORT_SYMBOL(svc_process);
|
||||||
EXPORT_SYMBOL(svc_recv);
|
EXPORT_SYMBOL(svc_recv);
|
||||||
EXPORT_SYMBOL(svc_wake_up);
|
EXPORT_SYMBOL(svc_wake_up);
|
||||||
EXPORT_SYMBOL(svc_makesock);
|
|
||||||
EXPORT_SYMBOL(svc_reserve);
|
EXPORT_SYMBOL(svc_reserve);
|
||||||
EXPORT_SYMBOL(svc_auth_register);
|
EXPORT_SYMBOL(svc_auth_register);
|
||||||
EXPORT_SYMBOL(auth_domain_lookup);
|
EXPORT_SYMBOL(auth_domain_lookup);
|
||||||
|
|
|
@ -1988,28 +1988,6 @@ void svc_force_close_socket(struct svc_sock *svsk)
|
||||||
svc_close_socket(svsk);
|
svc_close_socket(svsk);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* svc_makesock - Make a socket for nfsd and lockd
|
|
||||||
* @serv: RPC server structure
|
|
||||||
* @protocol: transport protocol to use
|
|
||||||
* @port: port to use
|
|
||||||
* @flags: requested socket characteristics
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
int svc_makesock(struct svc_serv *serv, int protocol, unsigned short port,
|
|
||||||
int flags)
|
|
||||||
{
|
|
||||||
dprintk("svc: creating socket proto = %d\n", protocol);
|
|
||||||
switch (protocol) {
|
|
||||||
case IPPROTO_TCP:
|
|
||||||
return svc_create_xprt(serv, "tcp", port, flags);
|
|
||||||
case IPPROTO_UDP:
|
|
||||||
return svc_create_xprt(serv, "udp", port, flags);
|
|
||||||
default:
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Handle defer and revisit of requests
|
* Handle defer and revisit of requests
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue