From owner-svn-src-all@FreeBSD.ORG  Fri Jan  9 15:21:54 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 92CDD14F;
 Fri,  9 Jan 2015 15:21:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7EA9A2F5;
 Fri,  9 Jan 2015 15:21:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t09FLsH4019833;
 Fri, 9 Jan 2015 15:21:54 GMT (envelope-from rwatson@FreeBSD.org)
Received: (from rwatson@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t09FLsfj019832;
 Fri, 9 Jan 2015 15:21:54 GMT (envelope-from rwatson@FreeBSD.org)
Message-Id: <201501091521.t09FLsfj019832@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rwatson set sender to
 rwatson@FreeBSD.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 9 Jan 2015 15:21:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276888 - head/sys/sys
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2015 15:21:54 -0000

Author: rwatson
Date: Fri Jan  9 15:21:53 2015
New Revision: 276888
URL: https://svnweb.freebsd.org/changeset/base/276888

Log:
  Uninline M_SIZE() in m_align() to reduce direct use of MLEN and MHLEN.
  
  Differential Revision:	https://reviews.freebsd.org/D1471
  Reviewed by:	glebius, bz, rpaulo
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/sys/mbuf.h

Modified: head/sys/sys/mbuf.h
==============================================================================
--- head/sys/sys/mbuf.h	Fri Jan  9 14:50:08 2015	(r276887)
+++ head/sys/sys/mbuf.h	Fri Jan  9 15:21:53 2015	(r276888)
@@ -848,14 +848,7 @@ m_align(struct mbuf *m, int len)
 
 	KASSERT(m->m_data == M_START(m), (msg, __func__));
 
-	if (m->m_flags & M_EXT) {
-		adjust = m->m_ext.ext_size - len;
-	} else if (m->m_flags & M_PKTHDR) {
-		adjust = MHLEN - len;
-	} else {
-		adjust = MLEN - len;
-	}
-
+	adjust = M_SIZE(m) - len;
 	m->m_data += adjust &~ (sizeof(long)-1);
 }