From owner-p4-projects@FreeBSD.ORG  Tue Aug 26 06:18:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 51696106566C; Tue, 26 Aug 2008 06:18:41 +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 1679B106567A
	for <perforce@FreeBSD.org>; Tue, 26 Aug 2008 06:18:41 +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 F39C28FC18
	for <perforce@FreeBSD.org>; Tue, 26 Aug 2008 06:18:40 +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 m7Q6IeR5084617
	for <perforce@FreeBSD.org>; Tue, 26 Aug 2008 06:18:40 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q6IeaP084615
	for perforce@freebsd.org; Tue, 26 Aug 2008 06:18:40 GMT
	(envelope-from ed@FreeBSD.org)
Date: Tue, 26 Aug 2008 06:18:40 GMT
Message-Id: <200808260618.m7Q6IeaP084615@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 148494 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: Tue, 26 Aug 2008 06:18:41 -0000

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

Change 148494 by ed@ed_dull on 2008/08/26 06:18:38

	We must check for zero-length queues when actually destroying
	the TTY, not when a close() is being processed.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/tty.c#32 edit

Differences ...

==== //depot/projects/mpsafetty/sys/kern/tty.c#32 (text+ko) ====

@@ -895,6 +895,10 @@
 	tty_list_count--;
 	sx_xunlock(&tty_list_sx);
 
+	/* Make sure we haven't leaked buffers. */
+	MPASS(ttyinq_getsize(&tp->t_inq) == 0);
+	MPASS(ttyoutq_getsize(&tp->t_outq) == 0);
+
 	knlist_destroy(&tp->t_inpoll.si_note);
 	knlist_destroy(&tp->t_outpoll.si_note);
 
@@ -923,9 +927,6 @@
 		return;
 	}
 
-	MPASS(ttyinq_getsize(&tp->t_inq) == 0);
-	MPASS(ttyoutq_getsize(&tp->t_outq) == 0);
-
 	/* TTY can be deallocated. */
 	dev = tp->t_dev;
 	tp->t_dev = NULL;