PERFORCE change 150226 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Sun Sep 21 18:48:37 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=150226
Change 150226 by trasz at trasz_traszkan on 2008/09/21 18:48:13
Branding is a libc thing. Remove it from 'struct acl', and move
into acl_t_struct.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#7 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_init.c#6 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#26 edit
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#7 (text+ko) ====
@@ -60,7 +60,7 @@
int
_acl_brand(const acl_t acl)
{
- return (acl->ats_acl.acl_brand);
+ return (acl->ats_brand);
}
int
@@ -98,7 +98,7 @@
{
assert(_acl_brand_may_be(acl, brand));
- acl->ats_acl.acl_brand = brand;
+ acl->ats_brand = brand;
}
void
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_init.c#6 (text+ko) ====
@@ -65,7 +65,7 @@
bzero(acl, sizeof(struct acl_t_struct));
- acl->ats_acl.acl_brand = ACL_BRAND_UNKNOWN;
+ acl->ats_brand = ACL_BRAND_UNKNOWN;
acl->ats_acl.acl_magic = ACL_MAGIC;
acl->ats_acl.acl_length = ACL_MAX_ENTRIES;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#26 (text+ko) ====
@@ -115,15 +115,7 @@
int acl_magic;
int acl_cnt;
int acl_length;
- /*
- * acl_brand is for libc internal bookkeeping only.
- * Applications should use acl_get_brand_np(3).
- * Kernel code should use the "type" argument passed
- * to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls;
- * ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e
- * ACL, ACL_TYPE_NFS4 means NFS4 ACL.
- */
- int acl_brand;
+ int acl_spare_field;
struct acl_entry acl_entry[ACL_MAX_ENTRIES];
};
@@ -133,13 +125,22 @@
struct acl_t_struct {
struct acl ats_acl;
int ats_cur_entry;
+ /*
+ * ats_brand is for libc internal bookkeeping only.
+ * Applications should use acl_get_brand_np(3).
+ * Kernel code should use the "type" argument passed
+ * to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls;
+ * ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e
+ * ACL, ACL_TYPE_NFS4 means NFS4 ACL.
+ */
+ int ats_brand;
};
typedef struct acl_t_struct *acl_t;
#define ACL_MAGIC 0x5452535a
/*
- * Possible valid values for acl_brand field.
+ * Possible valid values for ats_brand field.
*/
#define ACL_BRAND_UNKNOWN 0
#define ACL_BRAND_POSIX 1
More information about the p4-projects
mailing list