From 66ea9219a2d4545b1cd2a6a702efc57d3add52ef Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Mon, 13 Apr 2020 00:07:37 +0000 Subject: [PATCH] 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. --- sys/fs/nfs/nfskpiport.h | 9 --------- sys/fs/nfs/nfsport.h | 1 - 2 files changed, 10 deletions(-) diff --git a/sys/fs/nfs/nfskpiport.h b/sys/fs/nfs/nfskpiport.h index f428d9dd9c5..394aa89c9e2 100644 --- a/sys/fs/nfs/nfskpiport.h +++ b/sys/fs/nfs/nfskpiport.h @@ -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. diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index bfe9db97cee..9f7ec3d11de 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -172,7 +172,6 @@ MGETHDR((m), M_WAITOK, MT_DATA); \ } \ } while (0) -#define NFSMTOD mtod /* * Client side constant for size of a lockowner name.