From owner-svn-src-head@FreeBSD.ORG  Wed Apr 15 20:08:27 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C5821065673;
	Wed, 15 Apr 2009 20:08:27 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B6478FC19;
	Wed, 15 Apr 2009 20:08:27 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3FK8RB4053222;
	Wed, 15 Apr 2009 20:08:27 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3FK8RQa053221;
	Wed, 15 Apr 2009 20:08:27 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200904152008.n3FK8RQa053221@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 15 Apr 2009 20:08:27 +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: r191115 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Apr 2009 20:08:28 -0000

Author: ed
Date: Wed Apr 15 20:08:26 2009
New Revision: 191115
URL: http://svn.freebsd.org/changeset/base/191115

Log:
  Don't use si_drv0 directly.
  
  We should still access si_drv0 using dev2unit(). Also change the
  KASSERT() to really print the udev instead of the unit number. I suspect
  it's still useful to print the unit number, especially for devices that
  use clone lists, so keep the unit number in the panic string.

Modified:
  head/sys/kern/kern_conf.c

Modified: head/sys/kern/kern_conf.c
==============================================================================
--- head/sys/kern/kern_conf.c	Wed Apr 15 19:58:41 2009	(r191114)
+++ head/sys/kern/kern_conf.c	Wed Apr 15 20:08:26 2009	(r191115)
@@ -523,7 +523,7 @@ newdev(struct cdevsw *csw, int y, struct
 	if (csw->d_flags & D_NEEDMINOR) {
 		/* We may want to return an existing device */
 		LIST_FOREACH(si2, &csw->d_devs, si_list) {
-			if (si2->si_drv0 == udev) {
+			if (dev2unit(si2) == udev) {
 				dev_free_devlocked(si);
 				return (si2);
 			}
@@ -1042,7 +1042,7 @@ clone_cleanup(struct clonedevs **cdp)
 		if (!(cp->cdp_flags & CDP_SCHED_DTR)) {
 			cp->cdp_flags |= CDP_SCHED_DTR;
 			KASSERT(dev->si_flags & SI_NAMED,
-				("Driver has goofed in cloning underways udev %x", dev->si_drv0));
+				("Driver has goofed in cloning underways udev %x unit %x", dev2udev(dev), dev2unit(dev)));
 			destroy_devl(dev);
 		}
 	}