PERFORCE change 160058 for review

[Edward Tomasz Napierala]

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

Change 160058 by trasz at trasz_victim7 on 2009/03/31 15:16:22

	Shrink 'struct acl' somewhat.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#29 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#29 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 /* 
  * Developed by the TrustedBSD Project.
- * Support for POSIX.1e access control lists.
+ * Support for POSIX.1e and NFSv4 access control lists.
  */
 
 #ifndef _SYS_ACL_H_
@@ -87,13 +87,13 @@
 /*
  * Current "struct acl".
  */
-typedef int	acl_tag_t;
-typedef int	acl_flag_t;
-typedef int	acl_perm_t;
-typedef int	acl_extended_t;
-typedef int	acl_type_t;
-typedef int	*acl_permset_t;
-typedef int	*acl_flagset_t;
+typedef uint32_t	acl_tag_t;
+typedef uint32_t	acl_perm_t;
+typedef uint16_t	acl_extended_t;
+typedef uint16_t	acl_flag_t;
+typedef int		acl_type_t;
+typedef int		*acl_permset_t;
+typedef int		*acl_flagset_t;
 
 struct acl_entry {
 	acl_tag_t	ae_tag;
@@ -163,10 +163,10 @@
 /*
  * Possible valid values for ae_extended field.
  */
-#define	ACL_EXTENDED_ALLOW	0x00000100
-#define	ACL_EXTENDED_DENY	0x00000200
-#define	ACL_EXTENDED_AUDIT	0x00000400
-#define	ACL_EXTENDED_ALARM	0x00000800
+#define	ACL_EXTENDED_ALLOW	0x0100
+#define	ACL_EXTENDED_DENY	0x0200
+#define	ACL_EXTENDED_AUDIT	0x0400
+#define	ACL_EXTENDED_ALARM	0x0800
 
 /*
  * Possible valid values for acl_type_t arguments.  First two
@@ -179,7 +179,7 @@
 #define	ACL_TYPE_NFS4		0x00000004
 
 /*
- * Possible flags in ae_perm field for POSIX ACLs.
+ * Possible flags in ae_perm field for POSIX.1e ACLs.
  */
 #define	ACL_EXECUTE		0x0001
 #define	ACL_WRITE		0x0002
@@ -212,10 +212,11 @@
 #define	ACL_WRITE_OWNER		0x10000000
 #define	ACL_SYNCHRONIZE		0x20000000
 
-#define	ACL_NFS4_PERM_BITS	(ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | \
-    ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | ACL_EXECUTE | ACL_DELETE_CHILD | \
-    ACL_READ_ATTRIBUTES | ACL_WRITE_ATTRIBUTES | ACL_DELETE | ACL_READ_ACL | \
-    ACL_WRITE_ACL | ACL_WRITE_OWNER | ACL_SYNCHRONIZE)
+#define	ACL_NFS4_PERM_BITS	(ACL_READ_DATA | ACL_WRITE_DATA | \
+    ACL_APPEND_DATA | ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | \
+    ACL_EXECUTE | ACL_DELETE_CHILD | ACL_READ_ATTRIBUTES | \
+    ACL_WRITE_ATTRIBUTES | ACL_DELETE | ACL_READ_ACL | ACL_WRITE_ACL | \
+    ACL_WRITE_OWNER | ACL_SYNCHRONIZE)
 
 /*
  * Possible entry_id values for acl_get_entry(3).
@@ -226,15 +227,16 @@
 /*
  * Possible values in ae_flags field; valid only for NFSv4 ACLs.
  */
-#define	ACL_ENTRY_FILE_INHERIT		0x00000001
-#define	ACL_ENTRY_DIRECTORY_INHERIT	0x00000002
-#define	ACL_ENTRY_LIMIT_INHERIT		0x00000004 /* "NO_PROPAGATE_INHERIT" */
-#define	ACL_ENTRY_ONLY_INHERIT		0x00000008 /* "INHERIT_ONLY" */
-#define	ACL_ENTRY_SUCCESSFUL_ACCESS	0x00000010
-#define	ACL_ENTRY_FAILED_ACCESS		0x00000020
+#define	ACL_ENTRY_FILE_INHERIT		0x0001
+#define	ACL_ENTRY_DIRECTORY_INHERIT	0x0002
+#define	ACL_ENTRY_LIMIT_INHERIT		0x0004 /* "NO_PROPAGATE_INHERIT" */
+#define	ACL_ENTRY_ONLY_INHERIT		0x0008 /* "INHERIT_ONLY" */
+#define	ACL_ENTRY_SUCCESSFUL_ACCESS	0x0010
+#define	ACL_ENTRY_FAILED_ACCESS		0x0020
 
-#define	ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \
-    ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \
+#define	ACL_FLAGS_BITS			(ACL_ENTRY_FILE_INHERIT | \
+    ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_LIMIT_INHERIT | \
+    ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \
     ACL_ENTRY_FAILED_ACCESS)
 
 /*