Date: Mon, 20 Oct 2003 14:30:24 -0700 (PDT) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 40024 for review Message-ID: <200310202130.h9KLUORe091206@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310202130.h9KLUORe091206>