From owner-p4-projects@FreeBSD.ORG  Fri Jul 11 14:04:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E29121065675; Fri, 11 Jul 2008 14:04:20 +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 A65461065670
	for <perforce@freebsd.org>; Fri, 11 Jul 2008 14:04:20 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A7FC28FC14
	for <perforce@freebsd.org>; Fri, 11 Jul 2008 14:04:20 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6BE4Kkx061831
	for <perforce@freebsd.org>; Fri, 11 Jul 2008 14:04:20 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6BE4KO0061829
	for perforce@freebsd.org; Fri, 11 Jul 2008 14:04:20 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 11 Jul 2008 14:04:20 GMT
Message-Id: <200807111404.m6BE4KO0061829@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145066 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: Fri, 11 Jul 2008 14:04:21 -0000

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

Change 145066 by trasz@trasz_traszkan on 2008/07/11 14:03:45

	Make KASSERTs compilable.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#8 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#8 (text+ko) ====

@@ -130,7 +130,7 @@
 
 		default:
 			KASSERT(entry->ae_tag == ACL_EVERYONE,
-			    "entry->ae_tag == ACL_EVERYONE");
+			    ("entry->ae_tag == ACL_EVERYONE"));
 		}
 
 		if (entry->ae_extended == ACL_EXTENDED_DENY) {
@@ -596,7 +596,7 @@
 		    ACL_SYNCHRONIZE, ACL_EXTENDED_ALLOW);
 
 		KASSERT(a1 != NULL && a2 != NULL && a3 != NULL && a4 != NULL &&
-		    a5 != NULL && a6 != NULL, "couldn't append to ACL.");
+		    a5 != NULL && a6 != NULL, ("couldn't append to ACL."));
 	}
 
 	/*
@@ -641,7 +641,7 @@
 	else
 		a5->ae_perm |= ACL_EXECUTE;
 
-	KASSERT(aclp->acl_cnt >= 6, "acl->acl_cnt >= 6");
+	KASSERT(aclp->acl_cnt >= 6, ("acl->acl_cnt >= 6"));
 
 	return (0);
 }
@@ -786,7 +786,7 @@
 	const struct acl_entry *parent_entry;
 	struct acl_entry *entry, *copy;
 
-	KASSERT(child_aclp->acl_cnt == 0, "child_aclp->acl_cnt == 0");
+	KASSERT(child_aclp->acl_cnt == 0, ("child_aclp->acl_cnt == 0"));
 
 	/*
 	 * NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-03.txt
@@ -811,7 +811,7 @@
 			continue;
 
 		KASSERT(child_aclp->acl_cnt < ACL_MAX_ENTRIES,
-		    "child_aclp->acl_cnt < ACL_MAX_ENTRIES");
+		    ("child_aclp->acl_cnt < ACL_MAX_ENTRIES"));
 		child_aclp->acl_entry[child_aclp->acl_cnt] = *parent_entry;
 		child_aclp->acl_cnt++;
 	}