[Pvfs2-cvs] commit by pcarns in pvfs2-1/include: pvfs2-event.h pvfs2-mgmt.h pvfs2-types.h

[CVS commit program]

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

Modified Files:
	pvfs2-event.h pvfs2-mgmt.h pvfs2-types.h 
Log Message:
Merging small files branch to head.  Includes server side precreation of
data files and file stuffing.


Index: pvfs2-event.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/include/pvfs2-event.h,v
diff -p -u -r1.13 -r1.14
--- pvfs2-event.h	13 Sep 2006 20:22:44 -0000	1.13
+++ pvfs2-event.h	8 Sep 2008 15:42:37 -0000	1.14
@@ -65,6 +65,7 @@ enum PVFS_event_op
      PVFS_EVENT_TROVE_KEYVAL_WRITE_LIST = 25,
      PVFS_EVENT_TROVE_KEYVAL_GET_HANDLE_INFO = 26,
      PVFS_EVENT_TROVE_DSPACE_GETATTR_LIST = 27,
+     PVFS_EVENT_TROVE_KEYVAL_REMOVE_LIST = 28,
 };
 
 #endif /* __PVFS2_EVENT_H */

Index: pvfs2-mgmt.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/include/pvfs2-mgmt.h,v
diff -p -u -r1.62 -r1.63
--- pvfs2-mgmt.h	19 Nov 2007 21:12:59 -0000	1.62
+++ pvfs2-mgmt.h	8 Sep 2008 15:42:37 -0000	1.63
@@ -124,7 +124,6 @@ enum
     PVFS_MGMT_META_SERVER = 2
 };
 
-
 PVFS_error PVFS_mgmt_count_servers(
     PVFS_fs_id fs_id,
     PVFS_credentials *credentials,
@@ -272,6 +271,7 @@ PVFS_error PVFS_imgmt_iterate_handles_li
     PVFS_ds_position *position_array,
     PVFS_BMI_addr_t *addr_array,
     int server_count,
+    int flags,
     PVFS_error_details *details,
     PVFS_mgmt_op_id *op_id,
     void *user_ptr);
@@ -284,6 +284,7 @@ PVFS_error PVFS_mgmt_iterate_handles_lis
     PVFS_ds_position *position_array,
     PVFS_BMI_addr_t *addr_array,
     int server_count,
+    int flags,
     PVFS_error_details *details);
 
 PVFS_error PVFS_imgmt_get_dfile_array(

Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/include/pvfs2-types.h,v
diff -p -u -r1.150 -r1.151
--- pvfs2-types.h	8 Aug 2008 15:06:11 -0000	1.150
+++ pvfs2-types.h	8 Sep 2008 15:42:37 -0000	1.151
@@ -72,6 +72,10 @@ typedef int64_t PVFS_id_gen_t;
 /** Opaque value representing a destination address. */
 typedef int64_t PVFS_BMI_addr_t;
 
+inline void encode_PVFS_BMI_addr_t(char **pptr, const PVFS_BMI_addr_t *x);
+inline int encode_PVFS_BMI_addr_t_size_check(const PVFS_BMI_addr_t *x);
+inline void decode_PVFS_BMI_addr_t(char **pptr, PVFS_BMI_addr_t *x);
+
 #define encode_PVFS_error encode_int32_t
 #define decode_PVFS_error decode_int32_t
 #define encode_PVFS_offset encode_int64_t
@@ -216,11 +220,16 @@ typedef struct PVFS_sys_layout_s
      */
     struct PVFS_sys_server_list server_list;
 } PVFS_sys_layout;
+#define extra_size_PVFS_sys_layout PVFS_REQ_LIMIT_LAYOUT
+
+inline void encode_PVFS_sys_layout(char **pptr, const struct PVFS_sys_layout_s *x);
+inline void decode_PVFS_sys_layout(char **pptr, struct PVFS_sys_layout_s *x);
 
 /* predefined special values for types */
 #define PVFS_HANDLE_NULL     ((PVFS_handle)0)
 #define PVFS_FS_ID_NULL       ((PVFS_fs_id)0)
-#define PVFS_OP_NULL            ((id_gen_t)0)
+#define PVFS_OP_NULL         ((PVFS_id_gen_t)0)
+#define PVFS_BMI_ADDR_NULL ((PVFS_BMI_addr_t)0)
 #define PVFS_ITERATE_START    (INT32_MAX - 1)
 #define PVFS_ITERATE_END      (INT32_MAX - 2)
 #define PVFS_READDIR_START PVFS_ITERATE_START
@@ -266,7 +275,8 @@ typedef enum
     PVFS_TYPE_DATAFILE =    (1 << 1),
     PVFS_TYPE_DIRECTORY =   (1 << 2),
     PVFS_TYPE_SYMLINK =     (1 << 3),
-    PVFS_TYPE_DIRDATA =     (1 << 4)
+    PVFS_TYPE_DIRDATA =     (1 << 4),
+    PVFS_TYPE_INTERNAL =    (1 << 5)   /* for the server's private use */
 } PVFS_ds_type;
 
 #define decode_PVFS_ds_type decode_enum
@@ -814,6 +824,11 @@ enum PVFS_io_type
  * ROMIO to auto-detect access method given a mounted path.
  */
 #define PVFS2_SUPER_MAGIC 0x20030528
+
+/* flag value that can be used with mgmt_iterate_handles to retrieve
+ * reserved handle values
+ */
+#define PVFS_MGMT_RESERVED 1
 
 #endif /* __PVFS2_TYPES_H */