From owner-freebsd-current@FreeBSD.ORG  Mon Sep 13 17:08:54 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A364016A4CE
	for <freebsd-current@freebsd.org>;
	Mon, 13 Sep 2004 17:08:54 +0000 (GMT)
Received: from thunderbird.etv.net (thunderbird.etv.net [208.14.190.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4633143D41
	for <freebsd-current@freebsd.org>;
	Mon, 13 Sep 2004 17:08:54 +0000 (GMT)
	(envelope-from lists@efinley.com)
Received: from [205.161.203.50] (helo=science1)
	by thunderbird.etv.net with smtp (Exim 4.34 (FreeBSD))
	id 1C6uJx-0001Bk-Ab; Mon, 13 Sep 2004 11:08:53 -0600
Message-ID: <09fb01c499b4$5892b870$32cba1cd@science1>
From: "Elliot Finley" <lists@efinley.com>
To: "Jun Kuriyama" <kuriyama@imgsrc.co.jp>
References:
	<06c601c4973a$1d1c5570$32cba1cd@science1><7m8ybip6qm.wl@black.imgsrc.co.jp><072201c4975c$db5bfa00$32cba1cd@science1><7mzn3xo1mj.wl@black.imgsrc.co.jp><07bb01c49812$bf4463a0$32cba1cd@science1><7my8jgomga.wl@black.imgsrc.co.jp>
	<7misainsd4.wl@black.imgsrc.co.jp>
Date: Mon, 13 Sep 2004 11:08:52 -0600
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2800.1437
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1441
cc: freebsd-current@freebsd.org
Subject: Re: Beta3 core dump
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Elliot Finley <lists@efinley.com>
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2004 17:08:54 -0000

This patch works for me.

----- Original Message ----- 
From: "Jun Kuriyama" <kuriyama@imgsrc.co.jp>
To: "Elliot Finley" <lists@efinley.com>
Cc: <freebsd-current@freebsd.org>
Sent: Monday, September 13, 2004 8:41 AM
Subject: Re: Beta3 core dump


> At Sun, 12 Sep 2004 00:27:17 +0900,
> kuriyama wrote:
> > > Just so you're clear on what I'm doing.  I made the code change, then
in
> > > /usr/src/lib/libc I do a 'make' then a 'make install', then I do a
> > > 'portsdb -fu'.
> >
> > Thanks.  My patch fixes 3 boxes in my office, but I find next one
> > still dumps core even with patch.  I'll dig into more...
>
> Okay, I find NetBSD has already fixes for this.  Please test with this
> patch if you still have problem with "portsdb -u".
>
>
> ==== //depot/user/kuriyama/ref5/src/lib/libc/db/btree/bt_split.c#3 -
/home/kuriyama/p4/kuriyama/ref5/src/lib/libc/db/btree/bt_split.c ====
> @@ -355,8 +355,6 @@
>   /* Put the new right page for the split into place. */
>   if ((r = __bt_new(t, &npg)) == NULL)
>   return (NULL);
> - /* XXX: Workaround for broken page data. */
> - memset(r, 0xff, t->bt_psize);
>   r->pgno = npg;
>   r->lower = BTDATAOFF;
>   r->upper = t->bt_psize;
> @@ -728,7 +726,7 @@
>   * the right page.
>   */
>   if (skip <= off) {
> - skip = 0;
> + skip = MAX_PAGE_OFFSET;
>   rval = l;
>   } else {
>   rval = r;
> @@ -738,7 +736,7 @@
>   for (off = 0; nxt < top; ++off) {
>   if (skip == nxt) {
>   ++off;
> - skip = 0;
> + skip = MAX_PAGE_OFFSET;
>   }
>   switch (h->flags & P_TYPE) {
>   case P_BINTERNAL:
>
>
> -- 
> Jun Kuriyama <kuriyama@imgsrc.co.jp> // IMG SRC, Inc.
>              <kuriyama@FreeBSD.org> // FreeBSD Project