From owner-p4-projects@FreeBSD.ORG  Sat Jan 19 16:14:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7669216A419; Sat, 19 Jan 2008 16:14:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3978516A417
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 16:14:27 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B97813C465
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 16:14:27 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JGERqm051903
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 16:14:27 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JGERPj051900
	for perforce@freebsd.org; Sat, 19 Jan 2008 16:14:27 GMT
	(envelope-from scottl@freebsd.org)
Date: Sat, 19 Jan 2008 16:14:27 GMT
Message-Id: <200801191614.m0JGERPj051900@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133661 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: Sat, 19 Jan 2008 16:14:27 -0000

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

Change 133661 by scottl@scottl-ix on 2008/01/19 16:13:55

	Fix a memory leak created by the last fix.

Affected files ...

.. //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#4 edit

Differences ...

==== //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#4 (text+ko) ====

@@ -826,10 +826,9 @@
 		switch (bret->operation) {
 		case BLKIF_OP_READ:
 			/* had an unaligned buffer that needs to be copied */
-			if (bp->bio_driver1) {
+			if (bp->bio_driver1)
 				bcopy(bp->bio_driver2, bp->bio_data, bp->bio_bcount);
-				bp->bio_driver1 = NULL;
-			}
+			/* FALLTHROUGH */
 		case BLKIF_OP_WRITE:
 
 			/* free the copy buffer */