From owner-svn-src-head@FreeBSD.ORG Fri Mar 15 10:21:19 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1A41C32B; Fri, 15 Mar 2013 10:21:19 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E96729C; Fri, 15 Mar 2013 10:21:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FALI45070152; Fri, 15 Mar 2013 10:21:18 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FALIPX070145; Fri, 15 Mar 2013 10:21:18 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201303151021.r2FALIPX070145@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 15 Mar 2013 10:21:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248318 - in head/sys: kern nfs xdr X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 10:21:19 -0000 Author: glebius Date: Fri Mar 15 10:21:18 2013 New Revision: 248318 URL: http://svnweb.freebsd.org/changeset/base/248318 Log: Use m_get() and m_getcl() instead of compat macros. Modified: head/sys/kern/uipc_sockbuf.c head/sys/nfs/nfs_common.c head/sys/xdr/xdr_mbuf.c Modified: head/sys/kern/uipc_sockbuf.c ============================================================================== --- head/sys/kern/uipc_sockbuf.c Fri Mar 15 10:20:15 2013 (r248317) +++ head/sys/kern/uipc_sockbuf.c Fri Mar 15 10:21:18 2013 (r248318) @@ -644,8 +644,8 @@ sbappendaddr_locked(struct sockbuf *sb, if (asa->sa_len > MLEN) return (0); #endif - MGET(m, M_NOWAIT, MT_SONAME); - if (m == 0) + m = m_get(M_NOWAIT, MT_SONAME); + if (m == NULL) return (0); m->m_len = asa->sa_len; bcopy(asa, mtod(m, caddr_t), asa->sa_len); Modified: head/sys/nfs/nfs_common.c ============================================================================== --- head/sys/nfs/nfs_common.c Fri Mar 15 10:20:15 2013 (r248317) +++ head/sys/nfs/nfs_common.c Fri Mar 15 10:21:18 2013 (r248318) @@ -192,7 +192,7 @@ nfsm_disct(struct mbuf **mdp, caddr_t *d } else if (siz > MHLEN) { panic("nfs S too big"); } else { - MGET(mp2, how, MT_DATA); + mp2 = m_get(how, MT_DATA); if (mp2 == NULL) return (NULL); mp2->m_len = siz; @@ -266,7 +266,7 @@ nfsm_build_xx(int s, struct mbuf **mb, c void *ret; if (s > M_TRAILINGSPACE(*mb)) { - MGET(mb2, M_WAITOK, MT_DATA); + mb2 = m_get(M_WAITOK, MT_DATA); if (s > MLEN) panic("build > MLEN"); (*mb)->m_next = mb2; Modified: head/sys/xdr/xdr_mbuf.c ============================================================================== --- head/sys/xdr/xdr_mbuf.c Fri Mar 15 10:20:15 2013 (r248317) +++ head/sys/xdr/xdr_mbuf.c Fri Mar 15 10:21:18 2013 (r248318) @@ -123,7 +123,7 @@ xdrmbuf_getall(XDR *xdrs) if (m) m_adj(m, xdrs->x_handy); else - MGET(m, M_WAITOK, MT_DATA); + m = m_get(M_WAITOK, MT_DATA); return (m); } @@ -228,9 +228,10 @@ xdrmbuf_putbytes(XDR *xdrs, const char * if (xdrs->x_handy == m->m_len && M_TRAILINGSPACE(m) == 0) { if (!m->m_next) { - MGET(n, M_WAITOK, m->m_type); if (m->m_flags & M_EXT) - MCLGET(n, M_WAITOK); + n = m_getcl(M_WAITOK, m->m_type, 0); + else + n = m_get(M_WAITOK, m->m_type); m->m_next = n; } m = m->m_next;