From owner-svn-src-all@FreeBSD.ORG  Tue May  3 19:12:42 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7D6AF106566B;
	Tue,  3 May 2011 19:12:42 +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 6D5C58FC14;
	Tue,  3 May 2011 19:12:42 +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 p43JCgGn007756;
	Tue, 3 May 2011 19:12:42 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p43JCg5N007754;
	Tue, 3 May 2011 19:12:42 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201105031912.p43JCg5N007754@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 3 May 2011 19:12:42 +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: r221400 - head/sys/geom
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: Tue, 03 May 2011 19:12:42 -0000

Author: mav
Date: Tue May  3 19:12:42 2011
New Revision: 221400
URL: http://svn.freebsd.org/changeset/base/221400

Log:
  Use make_dev_alias_p() added in r221397 to create alias dev entry.
  It removes panic in case if alias name is already busy for some reason.

Modified:
  head/sys/geom/geom_dev.c

Modified: head/sys/geom/geom_dev.c
==============================================================================
--- head/sys/geom/geom_dev.c	Tue May  3 18:57:46 2011	(r221399)
+++ head/sys/geom/geom_dev.c	Tue May  3 19:12:42 2011	(r221400)
@@ -148,7 +148,8 @@ g_dev_taste(struct g_class *mp, struct g
 			snprintf(buf, sizeof(buf), "%s%s",
 			    val, gp->name + len);
 			freeenv(val);
-			adev = make_dev_alias(dev, buf);
+			make_dev_alias_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK,
+			    &adev, dev, "%s", buf);
 			break;
 		}
 	}