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

---
 [refs]                     | 2 +-
 trunk/fs/nfsd/nfsctl.c     | 2 ++
 trunk/net/sunrpc/svcsock.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 362f902e0209..4205a00ff350 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ed94296a660a61989b5d54f0c4bb804f30567d3
+refs/heads/master: 37a034729ae611295bbb8e925333d4d54d7c1ebc
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 5c6a477c20ec..83997282fc1a 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/fs/nfsd/nfsctl.c
@@ -545,6 +545,8 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
 		if (nfsd_serv)
 			len = svc_sock_names(buf, nfsd_serv, toclose);
 		unlock_kernel();
+		if (len >= 0)
+			lockd_down();
 		kfree(toclose);
 		return len;
 	}
diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c
index cba85d195222..4e0813b12ccf 100644
--- a/trunk/net/sunrpc/svcsock.c
+++ b/trunk/net/sunrpc/svcsock.c
@@ -493,6 +493,8 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose)
 	spin_unlock(&serv->sv_lock);
 	if (closesk)
 		svc_delete_socket(closesk);
+	else if (toclose)
+		return -ENOENT;
 	return len;
 }
 EXPORT_SYMBOL(svc_sock_names);