From owner-svn-src-stable-7@FreeBSD.ORG  Sat Jan 31 12:32:18 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCBCE1065674;
	Sat, 31 Jan 2009 12:32:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A8BEF8FC25;
	Sat, 31 Jan 2009 12:32:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0VCWIgO024542;
	Sat, 31 Jan 2009 12:32:18 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0VCWIM6024541;
	Sat, 31 Jan 2009 12:32:18 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200901311232.n0VCWIM6024541@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 31 Jan 2009 12:32:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187952 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2009 12:32:20 -0000

Author: mav
Date: Sat Jan 31 12:32:18 2009
New Revision: 187952
URL: http://svn.freebsd.org/changeset/base/187952

Log:
  MFC rev. 187409
  
    Teach m_copyback() to use trailing space of the last mbuf in chain.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/uipc_mbuf.c

Modified: stable/7/sys/kern/uipc_mbuf.c
==============================================================================
--- stable/7/sys/kern/uipc_mbuf.c	Sat Jan 31 12:29:12 2009	(r187951)
+++ stable/7/sys/kern/uipc_mbuf.c	Sat Jan 31 12:32:18 2009	(r187952)
@@ -1267,6 +1267,10 @@ m_copyback(struct mbuf *m0, int off, int
 		m = m->m_next;
 	}
 	while (len > 0) {
+		if (m->m_next == NULL && (len > m->m_len - off)) {
+			m->m_len += min(len - (m->m_len - off),
+			    M_TRAILINGSPACE(m));
+		}
 		mlen = min (m->m_len - off, len);
 		bcopy(cp, off + mtod(m, caddr_t), (u_int)mlen);
 		cp += mlen;