Commit 0dba7c2a authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent d3fe5ea7

fs/lockd/svc.c

+14 −8
Original line number Diff line number Diff line
@@ -230,15 +230,21 @@ 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)

	if (err < 0)

		goto out_err;



	err = create_lockd_listener(serv, "tcp", nlm_tcpport);

	if (err >= 0) {

	if (err < 0)

		goto out_err;



	warned = 0;

		err = 0;

	} else if (warned++ == 0)

	return 0;



out_err:

	if (warned++ == 0)

		printk(KERN_WARNING

			"lockd_up: makesock failed, error=%d\n", err);

	return err;