From e9ea1fc30be96eabaa2a5852f8c688b1ce6df0c3 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 12 Jun 2008 13:38:42 +1000 Subject: [PATCH] --- yaml --- r: 104093 b: refs/heads/master c: c7d106c90ec40a0e35a6960157b40f238627246e h: refs/heads/master i: 104091: 7a8bd496d9c74caaebc9e99542a54c416d03f002 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfssvc.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6fb4641e8eb4..c39bdb318c95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abd1ec4efd82ca06127bce833ad8a4bbec8a0dcb +refs/heads/master: c7d106c90ec40a0e35a6960157b40f238627246e diff --git a/trunk/fs/nfsd/nfssvc.c b/trunk/fs/nfsd/nfssvc.c index 26c81149d49a..96fdbcab8d95 100644 --- a/trunk/fs/nfsd/nfssvc.c +++ b/trunk/fs/nfsd/nfssvc.c @@ -165,10 +165,12 @@ int nfsd_vers(int vers, enum vers_op change) int nfsd_nrthreads(void) { - if (nfsd_serv == NULL) - return 0; - else - return nfsd_serv->sv_nrthreads; + int rv = 0; + mutex_lock(&nfsd_mutex); + if (nfsd_serv) + rv = nfsd_serv->sv_nrthreads; + mutex_unlock(&nfsd_mutex); + return rv; } static void nfsd_last_thread(struct svc_serv *serv)