[src/netbsd-2-0]: src/sys/kern Pull up revision 1.19 (requested by martin in ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/df065d53aea6
branches:  netbsd-2-0
changeset: 564769:df065d53aea6
user:      snj <snj%NetBSD.org@localhost>
date:      Fri May 06 23:50:22 2005 +0000

description:
Pull up revision 1.19 (requested by martin in ticket #1503):
In m_pulldown avoid a prepend to the next mbuf in the chain if the result
would still not have all data we want continous.
Fixes PR kern/30098.

diffstat:

 sys/kern/uipc_mbuf2.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c322b712e751 -r df065d53aea6 sys/kern/uipc_mbuf2.c
--- a/sys/kern/uipc_mbuf2.c     Sun May 01 11:25:22 2005 +0000
+++ b/sys/kern/uipc_mbuf2.c     Fri May 06 23:50:22 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_mbuf2.c,v 1.16 2003/11/13 01:48:12 jonathan Exp $ */
+/*     $NetBSD: uipc_mbuf2.c,v 1.16.2.1 2005/05/06 23:50:22 snj Exp $  */
 /*     $KAME: uipc_mbuf2.c,v 1.29 2001/02/14 13:42:10 itojun Exp $     */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf2.c,v 1.16 2003/11/13 01:48:12 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf2.c,v 1.16.2.1 2005/05/06 23:50:22 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -173,7 +173,7 @@
                goto ok;
        }
        if ((off == 0 || offp) && M_LEADINGSPACE(n->m_next) >= hlen &&
-           !sharedcluster) {
+           !sharedcluster && n->m_next->m_len >= tlen) {
                n->m_next->m_data -= hlen;
                n->m_next->m_len += hlen;
                memcpy(mtod(n->m_next, caddr_t), mtod(n, caddr_t) + off, hlen);