From owner-p4-projects@FreeBSD.ORG  Fri Oct  8 19:58:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 233DD16A4D1; Fri,  8 Oct 2004 19:58:05 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F390616A4CE
	for <perforce@freebsd.org>; Fri,  8 Oct 2004 19:58:04 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E778943D45
	for <perforce@freebsd.org>; Fri,  8 Oct 2004 19:58:04 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i98Jw4EI025619
	for <perforce@freebsd.org>; Fri, 8 Oct 2004 19:58:04 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i98Jw4rx025616
	for perforce@freebsd.org; Fri, 8 Oct 2004 19:58:04 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 8 Oct 2004 19:58:04 GMT
Message-Id: <200410081958.i98Jw4rx025616@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 62866 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 08 Oct 2004 19:58:05 -0000

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

Change 62866 by jhb@jhb_slimer on 2004/10/08 19:57:06

	Fixup assertions.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_descrip.c#69 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_descrip.c#69 (text+ko) ====

@@ -179,7 +179,8 @@
 	FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
 	KASSERT(!fdisused(fdp, fd),
 	    ("fd already used"));
-	KASSERT(fdp->fd_map[NDSLOT(fd)] != 0xdeadc0de, ("writing to free'd map"));
+	KASSERT(fdp->fd_map[NDSLOT(fd)] != 0xdeadc0de,
+	    ("writing to free'd map"));
 	fdp->fd_map[NDSLOT(fd)] |= NDBIT(fd);
 	if (fd > fdp->fd_lastfile)
 		fdp->fd_lastfile = fd;
@@ -198,7 +199,8 @@
 	    ("fd is already unused"));
 	KASSERT(fdp->fd_ofiles[fd] == NULL,
 	    ("fd is still in use"));
-	KASSERT(fdp->fd_map[NDSLOT(fd)] != 0xdeadc0de, ("writing to free'd map"));	
+	KASSERT(fdp->fd_map[NDSLOT(fd)] != 0xdeadc0de,
+	    ("writing to free'd map"));	
 	fdp->fd_map[NDSLOT(fd)] &= ~NDBIT(fd);
 	if (fd < fdp->fd_freefile)
 		fdp->fd_freefile = fd;
@@ -391,7 +393,8 @@
 
 	case F_SETFD:
 		/* mtx_assert(&Giant, MA_NOTOWNED); */
-		KASSERT(*pop != (char)0xde, ("writing to free'd flags"));
+		KASSERT(*(uint32_t *)(((uintptr_t)pop) & ~3) != 0xdeadc0de,
+		    ("writing to free'd flags"));
 		*pop = (*pop &~ UF_EXCLOSE) |
 		    (arg & FD_CLOEXEC ? UF_EXCLOSE : 0);
 		FILEDESC_UNLOCK(fdp);
@@ -684,7 +687,8 @@
 	 * Duplicate the source descriptor
 	 */
 	fdp->fd_ofiles[new] = fp;
-	KASSERT(fdp->fd_ofileflags[old] != (char)0xde, ("reading/writing free'd file flags"));
+	KASSERT(*(uint32_t *)(((uintptr_t)&fdp->fd_ofileflags[old]) & ~3) !=
+	    0xdeadc0de, ("reading/writing free'd file flags"));
 	fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE;
 	if (new > fdp->fd_lastfile)
 		fdp->fd_lastfile = new;