From owner-svn-src-stable-9@FreeBSD.ORG  Fri Jul  5 16:03:20 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 57802A18;
 Fri,  5 Jul 2013 16:03:20 +0000 (UTC)
 (envelope-from andre@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 47E25147E;
 Fri,  5 Jul 2013 16:03:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65G3KHQ086966;
 Fri, 5 Jul 2013 16:03:20 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65G3Ku1086965;
 Fri, 5 Jul 2013 16:03:20 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201307051603.r65G3Ku1086965@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Fri, 5 Jul 2013 16:03:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252796 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 16:03:20 -0000

Author: andre
Date: Fri Jul  5 16:03:19 2013
New Revision: 252796
URL: http://svnweb.freebsd.org/changeset/base/252796

Log:
  MFC r242256:
  
   Improve m_cat() by being able to also merge contents from M_EXT
   mbuf's by doing proper testing with M_WRITABLE().
  
   In m_collapse() replace an incomplete manual check for M_RDONLY
   with the M_WRITABLE() macro that also tests for shared buffers
   and other cases that make a particular mbuf immutable.

Modified:
  stable/9/sys/kern/uipc_mbuf.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/uipc_mbuf.c
==============================================================================
--- stable/9/sys/kern/uipc_mbuf.c	Fri Jul  5 16:00:01 2013	(r252795)
+++ stable/9/sys/kern/uipc_mbuf.c	Fri Jul  5 16:03:19 2013	(r252796)
@@ -911,8 +911,8 @@ m_cat(struct mbuf *m, struct mbuf *n)
 	while (m->m_next)
 		m = m->m_next;
 	while (n) {
-		if (m->m_flags & M_EXT ||
-		    m->m_data + m->m_len + n->m_len >= &m->m_dat[MLEN]) {
+		if (!M_WRITABLE(m) ||
+		    M_TRAILINGSPACE(m) < n->m_len) {
 			/* just join the two chains */
 			m->m_next = n;
 			return;
@@ -1584,7 +1584,7 @@ again:
 		n = m->m_next;
 		if (n == NULL)
 			break;
-		if ((m->m_flags & M_RDONLY) == 0 &&
+		if (M_WRITABLE(m) &&
 		    n->m_len < M_TRAILINGSPACE(m)) {
 			bcopy(mtod(n, void *), mtod(m, char *) + m->m_len,
 				n->m_len);