Date: Sun, 5 Apr 2009 20:24:27 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 160246 for review Message-ID: <200904052024.n35KORa6016666@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=160246 Change 160246 by trasz@trasz_victim7 on 2009/04/05 20:24:19 Clean up a little. Note that this changes on-disk format. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#31 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#31 (text+ko) ==== @@ -52,7 +52,7 @@ #define OLDACL_MAX_ENTRIES 32 /* - * With 204 entries, "struct acl" is exactly one page big. + * With 204 entries, "struct acl_t_struct" is almost exactly one page big. * Note that with NFS4 ACLs, the maximum number of ACL entries one * may set on file or directory is about half of ACL_MAX_ENTRIES. * @@ -62,6 +62,8 @@ * The maximum number of POSIX.1e ACLs is controlled * by OLDACL_MAX_ENTRIES. Changing that one will break binary * compatibility with userland and change on-disk ACL layout. + * + * XXX: Recompute. */ #define ACL_MAX_ENTRIES 204 @@ -179,7 +181,8 @@ #define ACL_TYPE_NFS4 0x00000004 /* - * Possible flags in ae_perm field for POSIX.1e ACLs. + * Possible flags in ae_perm field for POSIX.1e ACLs. Note + * that ACL_EXECUTE may be used in both NFSv4 and POSIX.1e ACLs. */ #define ACL_EXECUTE 0x0001 #define ACL_WRITE 0x0002 @@ -190,27 +193,24 @@ /* * Possible flags in ae_perm field for NFSv4 ACLs. - * XXX: Change values of these to match rfc3530. */ -#define ACL_READ_DATA 0x00010000 -#define ACL_LIST_DIRECTORY 0x00010000 -#define ACL_WRITE_DATA 0x00020000 -#define ACL_ADD_FILE 0x00020000 -#define ACL_APPEND_DATA 0x00040000 -#define ACL_ADD_SUBDIRECTORY 0x00040000 -#define ACL_READ_NAMED_ATTRS 0x00080000 -#define ACL_WRITE_NAMED_ATTRS 0x00100000 -#ifdef XXX_conflicting_defines -#define ACL_EXECUTE 0x00200000 -#endif -#define ACL_DELETE_CHILD 0x00400000 -#define ACL_READ_ATTRIBUTES 0x00800000 -#define ACL_WRITE_ATTRIBUTES 0x01000000 -#define ACL_DELETE 0x02000000 -#define ACL_READ_ACL 0x04000000 -#define ACL_WRITE_ACL 0x08000000 -#define ACL_WRITE_OWNER 0x10000000 -#define ACL_SYNCHRONIZE 0x20000000 +#define ACL_READ_DATA 0x00000020 +#define ACL_LIST_DIRECTORY 0x00000020 +#define ACL_WRITE_DATA 0x00000040 +#define ACL_ADD_FILE 0x00000040 +#define ACL_APPEND_DATA 0x00000080 +#define ACL_ADD_SUBDIRECTORY 0x00000080 +#define ACL_READ_NAMED_ATTRS 0x00000100 +#define ACL_WRITE_NAMED_ATTRS 0x00000200 +/* ACL_EXECUTE is defined above. */ +#define ACL_DELETE_CHILD 0x00000400 +#define ACL_READ_ATTRIBUTES 0x00000800 +#define ACL_WRITE_ATTRIBUTES 0x00001000 +#define ACL_DELETE 0x00002000 +#define ACL_READ_ACL 0x00004000 +#define ACL_WRITE_ACL 0x00008000 +#define ACL_WRITE_OWNER 0x00010000 +#define ACL_SYNCHRONIZE 0x00020000 #define ACL_NFS4_PERM_BITS (ACL_READ_DATA | ACL_WRITE_DATA | \ ACL_APPEND_DATA | ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904052024.n35KORa6016666>