From owner-svn-src-all@FreeBSD.ORG  Fri Aug 22 15:38:21 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E8306FFE;
 Fri, 22 Aug 2014 15:38:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D417330DE;
 Fri, 22 Aug 2014 15:38:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7MFcLTd007010;
 Fri, 22 Aug 2014 15:38:21 GMT (envelope-from royger@FreeBSD.org)
Received: (from royger@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7MFcLp3007009;
 Fri, 22 Aug 2014 15:38:21 GMT (envelope-from royger@FreeBSD.org)
Message-Id: <201408221538.s7MFcLp3007009@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: royger set sender to
 royger@FreeBSD.org using -f
From: Roger Pau Monné <royger@FreeBSD.org>
Date: Fri, 22 Aug 2014 15:38:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270339 - head/sys/dev/xen/blkback
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Fri, 22 Aug 2014 15:38:22 -0000

Author: royger
Date: Fri Aug 22 15:38:21 2014
New Revision: 270339
URL: http://svnweb.freebsd.org/changeset/base/270339

Log:
  xen: fix incorrectly accounted free
  
  Fix some frees incorrectly assigned to M_XENBUS when the memory is
  allocated with M_XENSTORE.
  
  Sponsored by: Citrix Systems R&D
  MFC after:	1 week
  
  dev/xen/blkback/blkback.c:
   - Fix incorrect frees.

Modified:
  head/sys/dev/xen/blkback/blkback.c

Modified: head/sys/dev/xen/blkback/blkback.c
==============================================================================
--- head/sys/dev/xen/blkback/blkback.c	Fri Aug 22 15:36:57 2014	(r270338)
+++ head/sys/dev/xen/blkback/blkback.c	Fri Aug 22 15:38:21 2014	(r270339)
@@ -3852,17 +3852,17 @@ xbb_detach(device_t dev)
 	xbb_close_backend(xbb);
 
 	if (xbb->dev_mode != NULL) {
-		free(xbb->dev_mode, M_XENBUS);
+		free(xbb->dev_mode, M_XENSTORE);
 		xbb->dev_mode = NULL;
 	}
 
 	if (xbb->dev_type != NULL) {
-		free(xbb->dev_type, M_XENBUS);
+		free(xbb->dev_type, M_XENSTORE);
 		xbb->dev_type = NULL;
 	}
 
 	if (xbb->dev_name != NULL) {
-		free(xbb->dev_name, M_XENBUS);
+		free(xbb->dev_name, M_XENSTORE);
 		xbb->dev_name = NULL;
 	}