From owner-p4-projects@FreeBSD.ORG  Sun Aug  3 17:37:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA1DD106567D; Sun,  3 Aug 2008 17:37:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 95AB5106567A
	for <perforce@FreeBSD.org>; Sun,  3 Aug 2008 17:37:19 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 84DDD8FC14
	for <perforce@FreeBSD.org>; Sun,  3 Aug 2008 17:37:19 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m73HbJqx065924
	for <perforce@FreeBSD.org>; Sun, 3 Aug 2008 17:37:19 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m73HbJO8065922
	for perforce@freebsd.org; Sun, 3 Aug 2008 17:37:19 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sun, 3 Aug 2008 17:37:19 GMT
Message-Id: <200808031737.m73HbJO8065922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 146544 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Aug 2008 17:37:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=146544

Change 146544 by ed@ed_flippo on 2008/08/03 17:36:53

	Add a counter to store the number of null modem devices.

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/nmdm/nmdm.c#4 edit

Differences ...

==== //depot/projects/mpsafetty/sys/dev/nmdm/nmdm.c#4 (text+ko) ====

@@ -93,12 +93,16 @@
 	struct mtx	ns_mtx;
 };
 
+static int nmdm_count = 0;
+
 static struct nmdmsoftc *
 nmdm_alloc(unsigned long unit, struct ucred *cr)
 {
 	struct nmdmsoftc *ns;
 	struct tty *tp;
 
+	atomic_add_acq_int(&nmdm_count, 1);
+
 	ns = malloc(sizeof(*ns), M_NMDM, M_WAITOK|M_ZERO);
 	mtx_init(&ns->ns_mtx, "nmdm", NULL, MTX_DEF);
 
@@ -344,8 +348,9 @@
 		break;
 
 	case MOD_UNLOAD:
+		if (nmdm_count != 0)
+			return (EBUSY);
 		EVENTHANDLER_DEREGISTER(dev_clone, tag);
-		/* XXX: track counter! */
 		break;
 
 	default: