diff options
| author | Neil Brown <[email protected]> | 2008-06-12 13:38:42 +1000 |
|---|---|---|
| committer | J. Bruce Fields <[email protected]> | 2008-06-23 13:02:50 -0400 |
| commit | c7d106c90ec40a0e35a6960157b40f238627246e (patch) | |
| tree | 21dd79c282982c65f39a00df406dad02cadb6efc | |
| parent | abd1ec4efd82ca06127bce833ad8a4bbec8a0dcb (diff) | |
nfsd: fix race in nfsd_nrthreads()
We need the nfsd_mutex before accessing nfsd_serv->sv_nrthreads or we
can't even guarantee nfsd_serv will still be there.
Signed-off-by: Neil Brown <[email protected]>
Acked-by: Jeff Layton <[email protected]>
Signed-off-by: J. Bruce Fields <[email protected]>
| -rw-r--r-- | fs/nfsd/nfssvc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 26c81149d49a..96fdbcab8d95 100644 --- a/fs/nfsd/nfssvc.c +++ b/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) |