svn commit: r334904 - head/sys/fs/nfs

Rick Macklem rmacklem at FreeBSD.org
Sat Jun 9 23:38:23 UTC 2018


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.


More information about the svn-src-head mailing list