---

yaml --- r: 127486 b: refs/heads/master c: 0dba7c2 h: refs/heads/master v: v3
git-mirror · Jan 7, 2009 · 3a71124 · 3a71124
1 parent 8bfc0a3
commit 3a71124
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3fe5ea7cf815c037c90b1f1464ffc1ab5e8601b
+refs/heads/master: 0dba7c2a9ed3d4a1e58f5d94fffa9f44dbe012e6
diff --git a/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c
@@ -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;
 }