PERFORCE change 162731 for review

[Edward Tomasz Napierala]

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

Change 162731 by trasz at 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.