svn commit: r333889 - in projects/pnfs-planb-server/sys/fs: nfs nfsserver
Rick Macklem
rmacklem at FreeBSD.org
Sat May 19 19:46:58 UTC 2018
Author: rmacklem
Date: Sat May 19 19:46:57 2018
New Revision: 333889
URL: https://svnweb.freebsd.org/changeset/base/333889
Log:
Get rid of some mutexes no longer used now that the code is converted
to using taskqueue.
Modified:
projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c
projects/pnfs-planb-server/sys/fs/nfs/nfsport.h
projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c
Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c Sat May 19 19:30:42 2018 (r333888)
+++ projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c Sat May 19 19:46:57 2018 (r333889)
@@ -70,11 +70,6 @@ char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
struct callout newnfsd_callout;
int nfsrv_lughashsize = 100;
struct mtx nfsrv_dslock_mtx;
-struct mtx nfsrv_dsclock_mtx;
-struct mtx nfsrv_dsrmlock_mtx;
-struct mtx nfsrv_dwrpclock_mtx;
-struct mtx nfsrv_dsrpclock_mtx;
-struct mtx nfsrv_darpclock_mtx;
struct nfsdevicehead nfsrv_devidhead;
volatile int nfsrv_devidcnt = 0;
void (*nfsd_call_servertimer)(void) = NULL;
@@ -775,11 +770,6 @@ nfscommon_modevent(module_t mod, int type, void *data)
mtx_init(&nfsrv_nfsuserdsock.nr_mtx, "nfsuserd", NULL,
MTX_DEF);
mtx_init(&nfsrv_dslock_mtx, "nfs4ds", NULL, MTX_DEF);
- mtx_init(&nfsrv_dsclock_mtx, "nfsdsc", NULL, MTX_DEF);
- mtx_init(&nfsrv_dsrmlock_mtx, "nfsdsrm", NULL, MTX_DEF);
- mtx_init(&nfsrv_dwrpclock_mtx, "nfsdwrpc", NULL, MTX_DEF);
- mtx_init(&nfsrv_dsrpclock_mtx, "nfsdsrpc", NULL, MTX_DEF);
- mtx_init(&nfsrv_darpclock_mtx, "nfsdarpc", NULL, MTX_DEF);
TAILQ_INIT(&nfsrv_devidhead);
callout_init(&newnfsd_callout, 1);
newnfs_init();
@@ -808,11 +798,6 @@ nfscommon_modevent(module_t mod, int type, void *data)
mtx_destroy(&nfs_req_mutex);
mtx_destroy(&nfsrv_nfsuserdsock.nr_mtx);
mtx_destroy(&nfsrv_dslock_mtx);
- mtx_destroy(&nfsrv_dsclock_mtx);
- mtx_destroy(&nfsrv_dsrmlock_mtx);
- mtx_destroy(&nfsrv_dwrpclock_mtx);
- mtx_destroy(&nfsrv_dsrpclock_mtx);
- mtx_destroy(&nfsrv_darpclock_mtx);
loaded = 0;
break;
default:
Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsport.h
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfs/nfsport.h Sat May 19 19:30:42 2018 (r333888)
+++ projects/pnfs-planb-server/sys/fs/nfs/nfsport.h Sat May 19 19:46:57 2018 (r333889)
@@ -706,21 +706,6 @@ void nfsrvd_rcv(struct socket *, void *, int);
#define NFSDDSMUTEXPTR (&nfsrv_dslock_mtx)
#define NFSDDSLOCK() mtx_lock(&nfsrv_dslock_mtx)
#define NFSDDSUNLOCK() mtx_unlock(&nfsrv_dslock_mtx)
-#define NFSDSCLOCKMUTEXPTR (&nfsrv_dsclock_mtx)
-#define NFSDSCLOCK() mtx_lock(&nfsrv_dsclock_mtx)
-#define NFSDSCUNLOCK() mtx_unlock(&nfsrv_dsclock_mtx)
-#define NFSDSRMLOCKMUTEXPTR (&nfsrv_dsrmlock_mtx)
-#define NFSDSRMLOCK() mtx_lock(&nfsrv_dsrmlock_mtx)
-#define NFSDSRMUNLOCK() mtx_unlock(&nfsrv_dsrmlock_mtx)
-#define NFSDWRPCLOCKMUTEXPTR (&nfsrv_dwrpclock_mtx)
-#define NFSDWRPCLOCK() mtx_lock(&nfsrv_dwrpclock_mtx)
-#define NFSDWRPCUNLOCK() mtx_unlock(&nfsrv_dwrpclock_mtx)
-#define NFSDSRPCLOCKMUTEXPTR (&nfsrv_dsrpclock_mtx)
-#define NFSDSRPCLOCK() mtx_lock(&nfsrv_dsrpclock_mtx)
-#define NFSDSRPCUNLOCK() mtx_unlock(&nfsrv_dsrpclock_mtx)
-#define NFSDARPCLOCKMUTEXPTR (&nfsrv_darpclock_mtx)
-#define NFSDARPCLOCK() mtx_lock(&nfsrv_darpclock_mtx)
-#define NFSDARPCUNLOCK() mtx_unlock(&nfsrv_darpclock_mtx)
#define NFSDDONTLISTMUTEXPTR (&nfsrv_dontlistlock_mtx)
#define NFSDDONTLISTLOCK() mtx_lock(&nfsrv_dontlistlock_mtx)
#define NFSDDONTLISTUNLOCK() mtx_unlock(&nfsrv_dontlistlock_mtx)
Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Sat May 19 19:30:42 2018 (r333888)
+++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Sat May 19 19:46:57 2018 (r333889)
@@ -69,11 +69,6 @@ extern struct nfsstatsv1 nfsstatsv1;
extern struct nfslayouthash *nfslayouthash;
extern int nfsrv_layouthashsize;
extern struct mtx nfsrv_dslock_mtx;
-extern struct mtx nfsrv_dsclock_mtx;
-extern struct mtx nfsrv_dsrmlock_mtx;
-extern struct mtx nfsrv_dwrpclock_mtx;
-extern struct mtx nfsrv_dsrpclock_mtx;
-extern struct mtx nfsrv_darpclock_mtx;
extern int nfs_pnfsiothreads;
extern struct nfsdontlisthead nfsrv_dontlisthead;
extern volatile int nfsrv_dontlistlen;
More information about the svn-src-projects
mailing list