From owner-svn-src-projects@freebsd.org Sat May 19 19:46:58 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8548EEE1875 for ; Sat, 19 May 2018 19:46:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3701B7CF88; Sat, 19 May 2018 19:46:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 182B33D5A; Sat, 19 May 2018 19:46:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4JJkvTS004695; Sat, 19 May 2018 19:46:57 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JJkv7F004693; Sat, 19 May 2018 19:46:57 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201805191946.w4JJkv7F004693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 19 May 2018 19:46:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r333889 - in projects/pnfs-planb-server/sys/fs: nfs nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/pnfs-planb-server/sys/fs: nfs nfsserver X-SVN-Commit-Revision: 333889 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 19:46:58 -0000 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;