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

Rick Macklem rmacklem at FreeBSD.org
Mon Apr 13 00:07:38 UTC 2020


Author: rmacklem
Date: Mon Apr 13 00:07:37 2020
New Revision: 359840
URL: https://svnweb.freebsd.org/changeset/base/359840

Log:
  Delete the mbuf macros that were used for the Mac OS/X port.
  
  When the code was ported to Mac OS/X, mbuf handling functions were
  converted to using the Mac OS/X accessor functions. For FreeBSD, they
  are a simple set of macros in sys/fs/nfs/nfskpiport.h.
  Since r359757, r359780, r359785, r359810, r359811 have removed all uses
  of these macros, this patch deleted the macros from the .h files.
  
  My eventual goal is deleting nfskpiport.h, but that will take some more
  editting to replace uses of the remaining macros.

Modified:
  head/sys/fs/nfs/nfskpiport.h
  head/sys/fs/nfs/nfsport.h

Modified: head/sys/fs/nfs/nfskpiport.h
==============================================================================
--- head/sys/fs/nfs/nfskpiport.h	Sun Apr 12 22:22:53 2020	(r359839)
+++ head/sys/fs/nfs/nfskpiport.h	Mon Apr 13 00:07:37 2020	(r359840)
@@ -44,15 +44,6 @@ typedef struct vnode *		vnode_t;
 #define	vnode_vtype(v)		((v)->v_type)
 
 typedef struct mbuf *		mbuf_t;
-#define	mbuf_freem(m)		m_freem(m)
-#define	mbuf_data(m)		mtod((m), void *)
-#define	mbuf_len(m)		((m)->m_len)
-#define	mbuf_next(m)		((m)->m_next)
-#define	mbuf_setlen(m, l)	((m)->m_len = (l))
-#define	mbuf_setnext(m, p)	((m)->m_next = (p))
-#define	mbuf_pkthdr_len(m)	((m)->m_pkthdr.len)
-#define	mbuf_pkthdr_setlen(m, l) ((m)->m_pkthdr.len = (l))
-#define	mbuf_pkthdr_setrcvif(m, p) ((m)->m_pkthdr.rcvif = (p))
 
 /*
  * This stuff is needed by Darwin for handling the uio structure.

Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h	Sun Apr 12 22:22:53 2020	(r359839)
+++ head/sys/fs/nfs/nfsport.h	Mon Apr 13 00:07:37 2020	(r359840)
@@ -172,7 +172,6 @@
 			MGETHDR((m), M_WAITOK, MT_DATA); 	\
 		} 						\
 	} while (0)
-#define	NFSMTOD	mtod
 
 /*
  * Client side constant for size of a lockowner name.


More information about the svn-src-all mailing list