From owner-svn-src-all@freebsd.org Mon Apr 13 00:07:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5BAFB2AD704; Mon, 13 Apr 2020 00:07:38 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 490ppf1b66z3Mbp; Mon, 13 Apr 2020 00:07:38 +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 31970A397; Mon, 13 Apr 2020 00:07:38 +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 03D07cLT071265; Mon, 13 Apr 2020 00:07:38 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03D07beY071264; Mon, 13 Apr 2020 00:07:37 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202004130007.03D07beY071264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 13 Apr 2020 00:07:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359840 - 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: 359840 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.29 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: Mon, 13 Apr 2020 00:07:38 -0000 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.