From owner-svn-src-all@FreeBSD.ORG  Sun May  6 12:55:21 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3599D106564A;
	Sun,  6 May 2012 12:55:21 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20ECA8FC0A;
	Sun,  6 May 2012 12:55:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46CtKVs014826;
	Sun, 6 May 2012 12:55:20 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46CtKl7014823;
	Sun, 6 May 2012 12:55:20 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201205061255.q46CtKl7014823@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 6 May 2012 12:55:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235080 - head/sys/geom/raid
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 May 2012 12:55:21 -0000

Author: mav
Date: Sun May  6 12:55:20 2012
New Revision: 235080
URL: http://svn.freebsd.org/changeset/base/235080

Log:
  Plug small memory leaks.

Modified:
  head/sys/geom/raid/md_ddf.c
  head/sys/geom/raid/md_promise.c

Modified: head/sys/geom/raid/md_ddf.c
==============================================================================
--- head/sys/geom/raid/md_ddf.c	Sun May  6 11:48:37 2012	(r235079)
+++ head/sys/geom/raid/md_ddf.c	Sun May  6 12:55:20 2012	(r235080)
@@ -1228,7 +1228,7 @@ hdrerror:
 	}
 
 done:
-	free(abuf, M_MD_DDF);
+	g_free(abuf);
 	if (error != 0)
 		ddf_meta_free(meta);
 	return (error);
@@ -3039,6 +3039,8 @@ g_raid_md_free_volume_ddf(struct g_raid_
 		mdi->mdio_starting--;
 		callout_stop(&pv->pv_start_co);
 	}
+	free(pv, M_MD_DDF);
+	vol->v_md_data = NULL;
 	return (0);
 }
 

Modified: head/sys/geom/raid/md_promise.c
==============================================================================
--- head/sys/geom/raid/md_promise.c	Sun May  6 11:48:37 2012	(r235079)
+++ head/sys/geom/raid/md_promise.c	Sun May  6 12:55:20 2012	(r235080)
@@ -1955,6 +1955,8 @@ g_raid_md_free_volume_promise(struct g_r
 		pv->pv_started = 1;
 		callout_stop(&pv->pv_start_co);
 	}
+	free(pv, M_MD_PROMISE);
+	vol->v_md_data = NULL;
 	return (0);
 }