From owner-p4-projects@FreeBSD.ORG  Mon May 25 17:48:51 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A58A2106578E; Mon, 25 May 2009 17:48:51 +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 62779106578B
	for <perforce@freebsd.org>; Mon, 25 May 2009 17:48:51 +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 5181F8FC20
	for <perforce@freebsd.org>; Mon, 25 May 2009 17:48:51 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PHmppk097341
	for <perforce@freebsd.org>; Mon, 25 May 2009 17:48:51 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PHmpB4097339
	for perforce@freebsd.org; Mon, 25 May 2009 17:48:51 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 25 May 2009 17:48:51 GMT
Message-Id: <200905251748.n4PHmpB4097339@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 162731 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: Mon, 25 May 2009 17:48:53 -0000

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

Change 162731 by trasz@trasz_victim on 2009/05/25 17:48:43

	Makes including <sys/acl.h> less ugly.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/acl.h#3 add
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#4 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#24 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/zfs_acl.h>
-#include <sys/opensolaris_acl.h>
+#include <sys/acl.h>
 
 struct zfs2bsd {
 	uint32_t	zb_zfs;

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#24 (text+ko) ====

@@ -66,13 +66,7 @@
 #include <sys/buf.h>
 #include <sys/sf_buf.h>
 #include <sys/sched.h>
-
-/*
- * Pull FreeBSD sys/acl.h, not the ZFS one.
- */
-#include "../../../../../../../sys/acl.h"
-
-#include <sys/opensolaris_acl.h>
+#include <sys/acl.h>
 
 /*
  * Programming rules.