From b5189404a6b63b0a79d130e35b45d745d9be1f5c Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 4 Oct 2006 02:15:45 -0700
Subject: [PATCH] --- yaml --- r: 38363 b: refs/heads/master c:
 5680c44632053a6c9464bca43083f01776d318da h: refs/heads/master i:   38361:
 22675981975e4b2163ec9774a69adbe1acde594b   38359:
 14dbc4b03f3e82e64b0a8916a67eb912cc8c6cec v: v3

---
 [refs]                     |  2 +-
 trunk/fs/nfsd/nfsctl.c     | 12 ++++++------
 trunk/net/sunrpc/svcsock.c |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e2b2ef2db170..912ed31f71cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cda9e0cd8a6b30ccc32edced066c378fbd87003d
+refs/heads/master: 5680c44632053a6c9464bca43083f01776d318da
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index f85472dda463..6c2ddfed2cfc 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/fs/nfsd/nfsctl.c
@@ -523,11 +523,11 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
 		err = nfsd_create_serv();
 		if (!err) {
 			int proto = 0;
-			err = lockd_up(proto);
-			if (!err) {
-				err = svc_addsock(nfsd_serv, fd, buf, &proto);
-				if (err)
-					lockd_down();
+			err = svc_addsock(nfsd_serv, fd, buf, &proto);
+			if (err >= 0) {
+				err = lockd_up(proto);
+				if (err < 0)
+					svc_sock_names(buf+strlen(buf)+1, nfsd_serv, buf);
 			}
 			/* Decrease the count, but don't shutdown the
 			 * the service
@@ -536,7 +536,7 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
 			nfsd_serv->sv_nrthreads--;
 			unlock_kernel();
 		}
-		return err;
+		return err < 0 ? err : 0;
 	}
 	if (buf[0] == '-') {
 		char *toclose = kstrdup(buf+1, GFP_KERNEL);
diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c
index 4e0813b12ccf..4de8626e4f54 100644
--- a/trunk/net/sunrpc/svcsock.c
+++ b/trunk/net/sunrpc/svcsock.c
@@ -492,6 +492,9 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose)
 	}
 	spin_unlock(&serv->sv_lock);
 	if (closesk)
+		/* Should unregister with portmap, but you cannot
+		 * unregister just one protocol...
+		 */
 		svc_delete_socket(closesk);
 	else if (toclose)
 		return -ENOENT;