redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

NLM: Clean up flow of control in make_socks() function 

Clean up: Use Bruce's preferred control flow style in make_socks().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
hifive-unleashed-5.1
Chuck Lever 2008-12-31 16:06:11 -05:00 committed by J. Bruce Fields
parent d3fe5ea7cf
commit 0dba7c2a9e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/lockd/svc.c
View File

@ -230,17 +230,23 @@ static int create_lockd_listener(struct svc_serv *serv, char *name,
static int make_socks(struct svc_serv *serv)
{
static int warned;
int err = 0;
int err;
err = create_lockd_listener(serv, "udp", nlm_udpport);
if (err >= 0)
err = create_lockd_listener(serv, "tcp", nlm_tcpport);
if (err >= 0) {
warned = 0;
err = 0;
} else if (warned++ == 0)
if (err < 0)
goto out_err;
err = create_lockd_listener(serv, "tcp", nlm_tcpport);
if (err < 0)
goto out_err;
warned = 0;
return 0;
out_err:
if (warned++ == 0)
printk(KERN_WARNING
"lockd_up: makesock failed, error=%d\n", err);
"lockd_up: makesock failed, error=%d\n", err);
return err;
}