From owner-p4-projects@FreeBSD.ORG  Thu Jun 14 18:04:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 36E2116A473; Thu, 14 Jun 2007 18:04:13 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CF6D716A46B
	for <perforce@FreeBSD.org>; Thu, 14 Jun 2007 18:04:12 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id BE63813C458
	for <perforce@FreeBSD.org>; Thu, 14 Jun 2007 18:04:12 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5EI4CRT071167
	for <perforce@FreeBSD.org>; Thu, 14 Jun 2007 18:04:12 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5EI4CpR071132
	for perforce@freebsd.org; Thu, 14 Jun 2007 18:04:12 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Thu, 14 Jun 2007 18:04:12 GMT
Message-Id: <200706141804.l5EI4CpR071132@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lulf@FreeBSD.org using -f
From: Ulf Lilleengen <lulf@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 121644 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 14 Jun 2007 18:04:13 -0000

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

Change 121644 by lulf@lulf_carrot on 2007/06/14 18:03:54

	- Make sure we NULL out the last_read_plex so we don't get a panic after
	  a detach and a volume tries to read.
	 	- Fix a memory leak where I forgot to set the GV_BIO_MALLOC flag.

Affected files ...

.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#8 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#5 edit

Differences ...

==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#8 (text+ko) ====

@@ -1155,6 +1155,8 @@
 		return (GV_ERR_ISOPEN);
 	}
 	v->plexcount--;
+	/* Make sure someone don't read us when gone. */
+	v->last_read_plex = NULL; 
 	LIST_REMOVE(p, in_volume);
 	p->vol_sc = NULL;
 	memset(p->volume, 0, GV_MAXVOLNAME);

==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#5 (text+ko) ====

@@ -242,10 +242,9 @@
 	bp->bio_offset = offset;
 	bp->bio_caller2 = to;
 	bp->bio_cmd = type;
-	if (data == NULL) {
+	if (data == NULL)
 		data = g_malloc(length, M_WAITOK);
-		bp->bio_cflags |= GV_BIO_MALLOC;
-	}
+	bp->bio_cflags |= GV_BIO_MALLOC; /* Free on the next run. */
 	bp->bio_data = data;
 
 /*	printf("Sending next bio:\n ");