From 7b2b9a4949a2d8aeff6d7605828d57ed90df543c Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Thu, 1 Dec 2011 17:51:21 -0500
Subject: [PATCH] --- yaml --- r: 284639 b: refs/heads/master c:
 94cf3179ccfc69d727dd884fd0831d82ada6bb06 h: refs/heads/master i:   284637:
 de100bf60923af3b7e7fee8cd9e13530de57c988   284635:
 8a6a2b9f0fdcb23e0efbd1a36ad6dacbdf0d4770   284631:
 260859d85053088724f2f3a0a2f3b9d173297f81   284623:
 6433d1cf7266cc5c7ebcc788c2ea82f6405778d8   284607:
 ee516fc7c355b8678ee37021634d0021d66fb9df v: v3

---
 [refs]                 | 2 +-
 trunk/net/sunrpc/svc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bdfeb8e80e9c..d30a6052cab7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cf99b91c669510b785b459c211772091a94efd5
+refs/heads/master: 94cf3179ccfc69d727dd884fd0831d82ada6bb06
diff --git a/trunk/net/sunrpc/svc.c b/trunk/net/sunrpc/svc.c
index 1a6c16ed7fa6..e9632bb66535 100644
--- a/trunk/net/sunrpc/svc.c
+++ b/trunk/net/sunrpc/svc.c
@@ -686,8 +686,8 @@ choose_victim(struct svc_serv *serv, struct svc_pool *pool, unsigned int *state)
  * Create or destroy enough new threads to make the number
  * of threads the given number.  If `pool' is non-NULL, applies
  * only to threads in that pool, otherwise round-robins between
- * all pools.  Must be called with a svc_get() reference and
- * the BKL or another lock to protect access to svc_serv fields.
+ * all pools.  Caller must ensure that mutual exclusion between this and
+ * server startup or shutdown.
  *
  * Destroying threads relies on the service threads filling in
  * rqstp->rq_task, which only the nfs ones do.  Assumes the serv