From owner-freebsd-current@FreeBSD.ORG  Mon Sep 13 14:41:47 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 0978716A4CE
	for <freebsd-current@freebsd.org>;
	Mon, 13 Sep 2004 14:41:47 +0000 (GMT)
Received: from black.imgsrc.co.jp (black.imgsrc.co.jp [210.226.20.147])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5899443D3F
	for <freebsd-current@freebsd.org>;
	Mon, 13 Sep 2004 14:41:46 +0000 (GMT)
	(envelope-from kuriyama@imgsrc.co.jp)
Received: from localhost (localhost [127.0.0.1])
	by black.imgsrc.co.jp (Postfix) with ESMTP
	id 4105850B81; Mon, 13 Sep 2004 23:41:45 +0900 (JST)
Received: from black.imgsrc.co.jp (black.imgsrc.co.jp
	[IPv6:2001:218:422:2::9999])
	by black.imgsrc.co.jp (Postfix) with ESMTP
	id B82E050B8C; Mon, 13 Sep 2004 23:41:43 +0900 (JST)
Date: Mon, 13 Sep 2004 23:41:43 +0900
Message-ID: <7misainsd4.wl@black.imgsrc.co.jp>
From: Jun Kuriyama <kuriyama@imgsrc.co.jp>
To: "Elliot Finley" <lists@efinley.com>
In-Reply-To: <7my8jgomga.wl@black.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>
User-Agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.6 (Maruoka)
	FLIM/1.14.6 (Marutamachi) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0
	(SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
X-Virus-Scanned: by amavisd 0.1
cc: freebsd-current@freebsd.org
Subject: Re: Beta3 core dump
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
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 14:41:47 -0000

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