Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jeff Layton and committed by
J. Bruce Fields
3c519914 bbc7f33a

+6 -7
+2 -2
fs/lockd/svclock.c
··· 57 57 static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) 58 58 { 59 59 /* 60 - * We can get away with a static buffer because we're only 61 - * called with BKL held. 60 + * We can get away with a static buffer because this is only called 61 + * from lockd, which is single-threaded. 62 62 */ 63 63 static char buf[2*NLM_MAXCOOKIELEN+1]; 64 64 unsigned int i, len = sizeof(buf);
+1 -1
include/linux/sunrpc/svc.h
··· 110 110 * We use sv_nrthreads as a reference count. svc_destroy() drops 111 111 * this refcount, so we need to bump it up around operations that 112 112 * change the number of threads. Horrible, but there it is. 113 - * Should be called with the BKL held. 113 + * Should be called with the "service mutex" held. 114 114 */ 115 115 static inline void svc_get(struct svc_serv *serv) 116 116 {
+2 -2
net/sunrpc/svc.c
··· 768 768 EXPORT_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 772 - * the "service mutex", whichever is appropriate for the service. 771 + * Called from a server thread as it's exiting. Caller must hold the "service 772 + * mutex" for the service. 773 773 */ 774 774 void 775 775 svc_exit_thread(struct svc_rqst *rqstp)
+1 -2
net/sunrpc/svc_xprt.c
··· 42 42 * svc_pool->sp_lock protects most of the fields of that pool. 43 43 * svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt. 44 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 46 * svc_sock->sk_lock protects the svc_sock->sk_deferred list 47 47 * and the ->sk_info_authunix cache. 48 48 * ··· 67 67 * that no other thread will be using the transport or will 68 68 * try to set XPT_DEAD. 69 69 */ 70 - 71 70 int svc_reg_xprt_class(struct svc_xprt_class *xcl) 72 71 { 73 72 struct svc_xprt_class *cl;