From owner-svn-src-projects@FreeBSD.ORG  Tue Oct  4 17:50:22 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67ACC106566C;
	Tue,  4 Oct 2011 17:50:22 +0000 (UTC) (envelope-from lev@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 57D598FC15;
	Tue,  4 Oct 2011 17:50:22 +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 p94HoMIJ072772;
	Tue, 4 Oct 2011 17:50:22 GMT (envelope-from lev@svn.freebsd.org)
Received: (from lev@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94HoMlA072770;
	Tue, 4 Oct 2011 17:50:22 GMT (envelope-from lev@svn.freebsd.org)
Message-Id: <201110041750.p94HoMlA072770@svn.freebsd.org>
From: "Lev A. Serebryakov" <lev@FreeBSD.org>
Date: Tue, 4 Oct 2011 17:50:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226019 - projects/geom-events/sys/geom
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Oct 2011 17:50:22 -0000

Author: lev (ports committer)
Date: Tue Oct  4 17:50:22 2011
New Revision: 226019
URL: http://svn.freebsd.org/changeset/base/226019

Log:
  Use proper memory allocation flags for GEOM fast path

Modified:
  projects/geom-events/sys/geom/geom_notify.c

Modified: projects/geom-events/sys/geom/geom_notify.c
==============================================================================
--- projects/geom-events/sys/geom/geom_notify.c	Tue Oct  4 17:49:19 2011	(r226018)
+++ projects/geom-events/sys/geom/geom_notify.c	Tue Oct  4 17:50:22 2011	(r226019)
@@ -54,7 +54,7 @@ g_devctl_notify(struct g_provider *pp, c
 	int len;
 	int i;
 
-	subsystem = g_malloc(strlen(pp->geom->class->name) + 1, M_WAITOK);
+	subsystem = g_malloc(strlen(pp->geom->class->name) + 1, M_NOWAIT);
 	if (subsystem == NULL)
 		return;
 	for (i = 0; pp->geom->class->name[i]; i++)
@@ -62,7 +62,7 @@ g_devctl_notify(struct g_provider *pp, c
 	subsystem[i] = 0;
 
 	if (format != NULL) {
-		additional_data = g_malloc(1024, M_WAITOK);
+		additional_data = g_malloc(1024, M_NOWAIT);
 		if (additional_data == NULL) {
 			g_free(subsystem);
 			return;
@@ -78,7 +78,7 @@ g_devctl_notify(struct g_provider *pp, c
 	/* Add more space for mandatory arguments, space and zero */
 	len += sizeof("geom=") + strlen(pp->geom->name) +
 	       sizeof("provider=") + strlen(pp->name) + 2;
-	full_data = g_malloc(len, M_WAITOK);
+	full_data = g_malloc(len, M_NOWAIT);
 	if (full_data == NULL) {
 		g_free(subsystem);
 		if (additional_data != NULL)