Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NLM: Refactor make_socks() function

Browse source 
Clean up: extract common logic in NLM's make_socks() function
into a helper.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Chuck Lever 2008-12-31 16:06:04 -05:00 committed by J. Bruce Fields
parent 55ef1274dd
commit d3fe5ea7cf
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/lockd/svc.c
View file

@ -204,6 +204,19 @@ lockd(void *vrqstp)
return 0; return 0;
} }
static int create_lockd_listener(struct svc_serv *serv, char *name,
unsigned short port)
{
struct svc_xprt *xprt;
xprt = svc_find_xprt(serv, name, 0, 0);
if (xprt == NULL)
return svc_create_xprt(serv, name, port, SVC_SOCK_DEFAULTS);
svc_xprt_put(xprt);
return 0;
}
/* /*
* Ensure there are active UDP and TCP listeners for lockd. * Ensure there are active UDP and TCP listeners for lockd.
* *
@ -217,23 +230,11 @@ lockd(void *vrqstp)
static int make_socks(struct svc_serv *serv) static int make_socks(struct svc_serv *serv)
{ {
static int warned; static int warned;
struct svc_xprt *xprt;
int err = 0; int err = 0;
xprt = svc_find_xprt(serv, "udp", 0, 0); err = create_lockd_listener(serv, "udp", nlm_udpport);
if (!xprt) if (err >= 0)
err = svc_create_xprt(serv, "udp", nlm_udpport, err = create_lockd_listener(serv, "tcp", nlm_tcpport);
SVC_SOCK_DEFAULTS);
else
svc_xprt_put(xprt);
if (err >= 0) {
xprt = svc_find_xprt(serv, "tcp", 0, 0);
if (!xprt)
err = svc_create_xprt(serv, "tcp", nlm_tcpport,
SVC_SOCK_DEFAULTS);
else
svc_xprt_put(xprt);
}
if (err >= 0) { if (err >= 0) {
warned = 0; warned = 0;
err = 0; err = 0;