[Pvfs2-cvs] commit by kunkel in pvfs2/include: pvfs2-types.h pvfs2-util.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/include
In directory parlweb1:/tmp/cvs-serv30492/include

Modified Files:
      Tag: kunkel-branch
	pvfs2-types.h pvfs2-util.h 
Log Message:
Backmerge with HEAD


Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.130.4.2 -r1.130.4.3
--- pvfs2-types.h	19 Aug 2006 13:09:31 -0000	1.130.4.2
+++ pvfs2-types.h	29 Aug 2006 10:41:10 -0000	1.130.4.3
@@ -406,6 +406,29 @@ enum PVFS_server_mode
     PVFS_SERVER_ADMIN_MODE = 2        /* administrative mode */
 };
 
+/* PVFS2 ACL structures */
+typedef struct {
+    int32_t  p_tag;
+    uint32_t p_perm;
+    uint32_t p_id;
+} pvfs2_acl_entry;
+
+/* These defines match that of the POSIX defines */
+#define PVFS2_ACL_UNDEFINED_ID   (-1)
+
+/* p_tag entry in struct posix_acl_entry */
+#define PVFS2_ACL_USER_OBJ    (0x01)
+#define PVFS2_ACL_USER        (0x02)
+#define PVFS2_ACL_GROUP_OBJ   (0x04)
+#define PVFS2_ACL_GROUP       (0x08)
+#define PVFS2_ACL_MASK        (0x10)
+#define PVFS2_ACL_OTHER       (0x20)
+
+/* permissions in the p_perm field */
+#define PVFS2_ACL_READ       (0x04)
+#define PVFS2_ACL_WRITE      (0x02)
+#define PVFS2_ACL_EXECUTE    (0x01)
+
 /* PVFS2 errors
  *
  * Errors are made up of a code to indicate the error type and a class

Index: pvfs2-util.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-util.h,v
diff -p -u -r1.41.6.1 -r1.41.6.2
--- pvfs2-util.h	18 Aug 2006 05:11:57 -0000	1.41.6.1
+++ pvfs2-util.h	29 Aug 2006 10:41:10 -0000	1.41.6.2
@@ -60,6 +60,7 @@ int PVFS_util_init_defaults(void);
 /* client side config file / option management */
 const PVFS_util_tab* PVFS_util_parse_pvfstab(
     const char* tabfile);
+void PINT_release_pvfstab(void);
 int PVFS_util_resolve(
     const char* local_path,
     PVFS_fs_id* out_fs_id,