From owner-svn-src-all@freebsd.org Sat Jun 9 23:38:23 2018 Return-Path: Delivered-To: svn-src-all@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 3D70510012EB; Sat, 9 Jun 2018 23:38:23 +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 E80757EF37; Sat, 9 Jun 2018 23:38:22 +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 C8CD324AAC; Sat, 9 Jun 2018 23:38:22 +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 w59NcMGH097184; Sat, 9 Jun 2018 23:38:22 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w59NcMbi097183; Sat, 9 Jun 2018 23:38:22 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806092338.w59NcMbi097183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 9 Jun 2018 23:38:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334904 - head/sys/fs/nfs X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/sys/fs/nfs X-SVN-Commit-Revision: 334904 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2018 23:38:23 -0000 Author: rmacklem Date: Sat Jun 9 23:38:22 2018 New Revision: 334904 URL: https://svnweb.freebsd.org/changeset/base/334904 Log: Delete some macros that are unused. These macros were added because they were used by the pNFS server last year. However, they are no longer used by the pNFS server code and might as well be deleted. This is a partial reversion of r326735. Modified: head/sys/fs/nfs/nfsport.h Modified: head/sys/fs/nfs/nfsport.h ============================================================================== --- head/sys/fs/nfs/nfsport.h Sat Jun 9 23:24:08 2018 (r334903) +++ head/sys/fs/nfs/nfsport.h Sat Jun 9 23:38:22 2018 (r334904) @@ -705,21 +705,6 @@ void nfsrvd_rcv(struct socket *, void *, int); #define NFSUNLOCKLAYOUT(l) mtx_unlock(&((l)->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) /* * Use these macros to initialize/free a mutex.