aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJeff Layton <jeff.layton@primarydata.com>2015-01-22 08:19:32 -0500
committerJ. Bruce Fields <bfields@redhat.com>2015-01-23 10:29:12 -0500
commit3c5199143bc4b35f472c5c2534026d74821e2044 (patch)
tree1751acaacbd83ddc906e7b3b2c15f218b4ae4f4d /net
parentbbc7f33ac6ff6f48709ce892aa906ddb68b34517 (diff)
sunrpc/lockd: fix references to the BKL
The BKL is completely out of the picture in the lockd and sunrpc code these days. Update the antiquated comments that refer to it. Signed-off-by: Jeff Layton <jlayton@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/svc.c4
-rw-r--r--net/sunrpc/svc_xprt.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 91eaef1844c8..78974e4d9ad2 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -768,8 +768,8 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)
768EXPORT_SYMBOL_GPL(svc_set_num_threads); 768EXPORT_SYMBOL_GPL(svc_set_num_threads);
769 769
770/* 770/*
771 * Called from a server thread as it's exiting. Caller must hold the BKL or 771 * Called from a server thread as it's exiting. Caller must hold the "service
772 * the "service mutex", whichever is appropriate for the service. 772 * mutex" for the service.
773 */ 773 */
774void 774void
775svc_exit_thread(struct svc_rqst *rqstp) 775svc_exit_thread(struct svc_rqst *rqstp)
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index c69358b3cf7f..163ac45c3639 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -42,7 +42,7 @@ static LIST_HEAD(svc_xprt_class_list);
42 * svc_pool->sp_lock protects most of the fields of that pool. 42 * svc_pool->sp_lock protects most of the fields of that pool.
43 * svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt. 43 * svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt.
44 * when both need to be taken (rare), svc_serv->sv_lock is first. 44 * when both need to be taken (rare), svc_serv->sv_lock is first.
45 * BKL protects svc_serv->sv_nrthread. 45 * The "service mutex" protects svc_serv->sv_nrthread.
46 * svc_sock->sk_lock protects the svc_sock->sk_deferred list 46 * svc_sock->sk_lock protects the svc_sock->sk_deferred list
47 * and the ->sk_info_authunix cache. 47 * and the ->sk_info_authunix cache.
48 * 48 *
@@ -67,7 +67,6 @@ static LIST_HEAD(svc_xprt_class_list);
67 * that no other thread will be using the transport or will 67 * that no other thread will be using the transport or will
68 * try to set XPT_DEAD. 68 * try to set XPT_DEAD.
69 */ 69 */
70
71int svc_reg_xprt_class(struct svc_xprt_class *xcl) 70int svc_reg_xprt_class(struct svc_xprt_class *xcl)
72{ 71{
73 struct svc_xprt_class *cl; 72 struct svc_xprt_class *cl;