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>
This commit is contained in:
parent
bbc7f33ac6
commit
3c5199143b
4 changed files with 6 additions and 7 deletions
|
@ -57,8 +57,8 @@ static DEFINE_SPINLOCK(nlm_blocked_lock);
|
||||||
static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)
|
static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* We can get away with a static buffer because we're only
|
* We can get away with a static buffer because this is only called
|
||||||
* called with BKL held.
|
* from lockd, which is single-threaded.
|
||||||
*/
|
*/
|
||||||
static char buf[2*NLM_MAXCOOKIELEN+1];
|
static char buf[2*NLM_MAXCOOKIELEN+1];
|
||||||
unsigned int i, len = sizeof(buf);
|
unsigned int i, len = sizeof(buf);
|
||||||
|
|
|
@ -110,7 +110,7 @@ struct svc_serv {
|
||||||
* We use sv_nrthreads as a reference count. svc_destroy() drops
|
* We use sv_nrthreads as a reference count. svc_destroy() drops
|
||||||
* this refcount, so we need to bump it up around operations that
|
* this refcount, so we need to bump it up around operations that
|
||||||
* change the number of threads. Horrible, but there it is.
|
* change the number of threads. Horrible, but there it is.
|
||||||
* Should be called with the BKL held.
|
* Should be called with the "service mutex" held.
|
||||||
*/
|
*/
|
||||||
static inline void svc_get(struct svc_serv *serv)
|
static inline void svc_get(struct svc_serv *serv)
|
||||||
{
|
{
|
||||||
|
|
|
@ -768,8 +768,8 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)
|
||||||
EXPORT_SYMBOL_GPL(svc_set_num_threads);
|
EXPORT_SYMBOL_GPL(svc_set_num_threads);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Called from a server thread as it's exiting. Caller must hold the BKL or
|
* Called from a server thread as it's exiting. Caller must hold the "service
|
||||||
* the "service mutex", whichever is appropriate for the service.
|
* mutex" for the service.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
svc_exit_thread(struct svc_rqst *rqstp)
|
svc_exit_thread(struct svc_rqst *rqstp)
|
||||||
|
|
|
@ -42,7 +42,7 @@ static LIST_HEAD(svc_xprt_class_list);
|
||||||
* svc_pool->sp_lock protects most of the fields of that pool.
|
* svc_pool->sp_lock protects most of the fields of that pool.
|
||||||
* svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt.
|
* svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt.
|
||||||
* when both need to be taken (rare), svc_serv->sv_lock is first.
|
* when both need to be taken (rare), svc_serv->sv_lock is first.
|
||||||
* BKL protects svc_serv->sv_nrthread.
|
* The "service mutex" protects svc_serv->sv_nrthread.
|
||||||
* svc_sock->sk_lock protects the svc_sock->sk_deferred list
|
* svc_sock->sk_lock protects the svc_sock->sk_deferred list
|
||||||
* and the ->sk_info_authunix cache.
|
* and the ->sk_info_authunix cache.
|
||||||
*
|
*
|
||||||
|
@ -67,7 +67,6 @@ static LIST_HEAD(svc_xprt_class_list);
|
||||||
* that no other thread will be using the transport or will
|
* that no other thread will be using the transport or will
|
||||||
* try to set XPT_DEAD.
|
* try to set XPT_DEAD.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int svc_reg_xprt_class(struct svc_xprt_class *xcl)
|
int svc_reg_xprt_class(struct svc_xprt_class *xcl)
|
||||||
{
|
{
|
||||||
struct svc_xprt_class *cl;
|
struct svc_xprt_class *cl;
|
||||||
|
|
Loading…
Add table
Reference in a new issue