From owner-p4-projects@FreeBSD.ORG  Mon Oct 20 14:30:26 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD4C916A4C1; Mon, 20 Oct 2003 14:30:25 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 971C516A4B3
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 14:30:25 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C7D7243FBD
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 14:30:24 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9KLUOXJ091211
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 14:30:24 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9KLUORe091206
	for perforce@freebsd.org; Mon, 20 Oct 2003 14:30:24 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Mon, 20 Oct 2003 14:30:24 -0700 (PDT)
Message-Id: <200310202130.h9KLUORe091206@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40024 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Oct 2003 21:30:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=40024

Change 40024 by sam@sam_ebb on 2003/10/20 14:30:12

	IFC

Affected files ...

.. //depot/projects/netperf/sys/kern/vfs_cluster.c#4 integrate
.. //depot/projects/netperf/sys/kern/vfs_subr.c#8 integrate

Differences ...

==== //depot/projects/netperf/sys/kern/vfs_cluster.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_cluster.c,v 1.146 2003/10/20 05:57:55 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_cluster.c,v 1.147 2003/10/20 18:24:38 alc Exp $");
 
 #include "opt_debug_cluster.h"
 
@@ -373,7 +373,6 @@
 	bp->b_offset = tbp->b_offset;
 	KASSERT(bp->b_offset != NOOFFSET, ("cluster_rbuild: no buffer offset"));
 	pbgetvp(vp, bp);
-	bp->b_object = tbp->b_object;
 
 	TAILQ_INIT(&bp->b_cluster.cluster_head);
 

==== //depot/projects/netperf/sys/kern/vfs_subr.c#8 (text+ko) ====

@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.468 2003/10/17 11:56:48 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.469 2003/10/20 18:24:38 alc Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
@@ -1840,6 +1840,7 @@
 	KASSERT(bp->b_vp == NULL, ("pbgetvp: not free"));
 
 	bp->b_vp = vp;
+	bp->b_object = vp->v_object;
 	bp->b_flags |= B_PAGING;
 	bp->b_dev = vn_todev(vp);
 }
@@ -1865,6 +1866,7 @@
 	}
 	VI_UNLOCK(bp->b_vp);
 	bp->b_vp = (struct vnode *) 0;
+	bp->b_object = NULL;
 	bp->b_flags &= ~B_PAGING;
 }