[PATCH 0/2] Two minor lockd clean-ups

[PATCH 0/2] Two minor lockd clean-ups

[Chuck Lever]

Hi Bruce-

Here are two clean-up patches from the end of my NFSD for-2.6.29
series that are probably safe to include now.

---

Chuck Lever (2):
      NLM: Clean up flow of control in make_socks() function
      NLM: Refactor make_socks() function


 fs/lockd/svc.c |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

-- 
Chuck Lever <chuck.lever@oracle.com>

[PATCH 1/2] NLM: Refactor make_socks() function

[Chuck Lever]

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 fs/lockd/svc.c |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index fc7c453..955cfac 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -198,6 +198,19 @@ lockd(void *vrqstp)
 	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.
  *
@@ -211,23 +224,11 @@ lockd(void *vrqstp)
 static int make_socks(struct svc_serv *serv)
 {
 	static int warned;
-	struct svc_xprt *xprt;
 	int err = 0;
 
-	xprt = svc_find_xprt(serv, "udp", 0, 0);
-	if (!xprt)
-		err = svc_create_xprt(serv, "udp", nlm_udpport,
-				      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);
-	}
+	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;

[PATCH 2/2] NLM: Clean up flow of control in make_socks() function

[Chuck Lever]

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 fs/lockd/svc.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 955cfac..3fdc83c 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -224,17 +224,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;
 }
 

Re: [PATCH 0/2] Two minor lockd clean-ups

[J. Bruce Fields]

On Wed, Dec 31, 2008 at 04:05:55PM -0500, Chuck Lever wrote:
> Hi Bruce-
> 
> Here are two clean-up patches from the end of my NFSD for-2.6.29
> series that are probably safe to include now.

Both applied, thanks.--b.

> 
> ---
> 
> Chuck Lever (2):
>       NLM: Clean up flow of control in make_socks() function
>       NLM: Refactor make_socks() function
> 
> 
>  fs/lockd/svc.c |   49 ++++++++++++++++++++++++++++---------------------
>  1 files changed, 28 insertions(+), 21 deletions(-)
> 
> -- 
> Chuck Lever <chuck.lever@oracle.com>