[Pvfs2-cvs] commit by slang in pvfs2/include: pvfs2-debug.h
pvfs2-sysint.h pvfs2-types.h pvfs2-util.h
CVS commit program
cvs at parl.clemson.edu
Thu Oct 19 18:16:37 EDT 2006
Update of /projects/cvsroot/pvfs2/include
In directory parlweb1:/tmp/cvs-serv5758/include
Modified Files:
Tag: WALT3
pvfs2-debug.h pvfs2-sysint.h pvfs2-types.h pvfs2-util.h
Log Message:
reverse merge of HEAD to WALT3 branch.
Index: pvfs2-debug.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-debug.h,v
diff -p -u -r1.50.4.1 -r1.50.4.2
--- pvfs2-debug.h 18 Sep 2006 15:04:57 -0000 1.50.4.1
+++ pvfs2-debug.h 19 Oct 2006 22:16:37 -0000 1.50.4.2
@@ -67,6 +67,7 @@
#define GOSSIP_DBPF_KEYVAL_DEBUG ((uint64_t)1 << 45)
#define GOSSIP_LISTATTR_DEBUG ((uint64_t)1 << 46)
#define GOSSIP_DBPF_COALESCE_DEBUG ((uint64_t)1 << 47)
+#define GOSSIP_ACCESS_HOSTNAMES ((uint64_t)1 << 48)
/* NOTE: if you want your gossip flag to be controllable from
* pvfs2-set-debugmask you have to add it in
Index: pvfs2-sysint.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-sysint.h,v
diff -p -u -r1.67.2.1 -r1.67.2.2
--- pvfs2-sysint.h 18 Sep 2006 15:04:57 -0000 1.67.2.1
+++ pvfs2-sysint.h 19 Oct 2006 22:16:37 -0000 1.67.2.2
@@ -42,6 +42,7 @@ struct PVFS_sys_attr_s
PVFS2_ALIGN_VAR(char*, dist_params); /* NOTE: caller must free if valid */
PVFS_size dirent_count;
PVFS_ds_type objtype;
+ PVFS_flags flags;
uint32_t mask;
};
typedef struct PVFS_sys_attr_s PVFS_sys_attr;
@@ -245,7 +246,7 @@ PVFS_error PVFS_isys_ref_lookup(
PVFS_fs_id fs_id,
char *relative_pathname,
PVFS_object_ref parent_ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_lookup * resp,
int32_t follow_link,
PVFS_sys_op_id *op_id,
@@ -255,21 +256,21 @@ PVFS_error PVFS_sys_ref_lookup(
PVFS_fs_id fs_id,
char *relative_pathname,
PVFS_object_ref parent_ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_lookup * resp,
int32_t follow_link);
PVFS_error PVFS_sys_lookup(
PVFS_fs_id fs_id,
char *name,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_lookup * resp,
int32_t follow_link);
PVFS_error PVFS_isys_getattr(
PVFS_object_ref ref,
uint32_t attrmask,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_getattr *resp,
PVFS_sys_op_id *op_id,
void *user_ptr);
@@ -277,26 +278,26 @@ PVFS_error PVFS_isys_getattr(
PVFS_error PVFS_sys_getattr(
PVFS_object_ref ref,
uint32_t attrmask,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_getattr *resp);
PVFS_error PVFS_isys_setattr(
PVFS_object_ref ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sys_op_id *op_id,
void *user_ptr);
PVFS_error PVFS_sys_setattr(
PVFS_object_ref ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials);
+ const PVFS_credentials *credentials);
PVFS_error PVFS_isys_mkdir(
char *entry_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_mkdir *resp,
PVFS_sys_op_id *op_id,
void *user_ptr);
@@ -305,14 +306,14 @@ PVFS_error PVFS_sys_mkdir(
char *entry_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_mkdir *resp);
PVFS_error PVFS_isys_readdir(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_readdir *resp,
PVFS_sys_op_id *op_id,
void *user_ptr);
@@ -321,14 +322,14 @@ PVFS_error PVFS_sys_readdir(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_readdir *resp);
PVFS_error PVFS_isys_readdirplus(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
uint32_t attrmask,
PVFS_sysresp_readdirplus *resp,
PVFS_sys_op_id *op_id,
@@ -338,7 +339,7 @@ PVFS_error PVFS_sys_readdirplus(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
uint32_t attrmask,
PVFS_sysresp_readdirplus *resp);
@@ -346,7 +347,7 @@ PVFS_error PVFS_isys_create(
char *entry_name,
PVFS_object_ref ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sys_dist *dist,
PVFS_sysresp_create *resp,
PVFS_sys_op_id *op_id,
@@ -356,28 +357,28 @@ PVFS_error PVFS_sys_create(
char *entry_name,
PVFS_object_ref ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sys_dist *dist,
PVFS_sysresp_create *resp);
PVFS_error PVFS_isys_remove(
char *entry_name,
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sys_op_id *op_id,
void *user_ptr);
PVFS_error PVFS_sys_remove(
char *entry_name,
PVFS_object_ref ref,
- PVFS_credentials *credentials);
+ const PVFS_credentials *credentials);
PVFS_error PVFS_isys_rename(
char *old_entry,
PVFS_object_ref old_parent_ref,
char *new_entry,
PVFS_object_ref new_parent_ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sys_op_id *op_id,
void *user_ptr);
@@ -386,14 +387,14 @@ PVFS_error PVFS_sys_rename(
PVFS_object_ref old_parent_ref,
char *new_entry,
PVFS_object_ref new_parent_ref,
- PVFS_credentials *credentials);
+ const PVFS_credentials *credentials);
PVFS_error PVFS_isys_symlink(
char *entry_name,
PVFS_object_ref parent_ref,
char *target,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_symlink *resp,
PVFS_sys_op_id *op_id,
void *user_ptr);
@@ -403,7 +404,7 @@ PVFS_error PVFS_sys_symlink(
PVFS_object_ref parent_ref,
char *target,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_symlink *resp);
PVFS_error PVFS_isys_io(
@@ -412,7 +413,7 @@ PVFS_error PVFS_isys_io(
PVFS_offset file_req_offset,
void *buffer,
PVFS_Request mem_req,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_io *resp,
enum PVFS_io_type type,
PVFS_sys_op_id *op_id,
@@ -424,7 +425,7 @@ PVFS_error PVFS_sys_io(
PVFS_offset file_req_offset,
void *buffer,
PVFS_Request mem_req,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_io *resp,
enum PVFS_io_type type);
@@ -437,41 +438,41 @@ PVFS_sys_io(x1,x2,x3,x4,x5,x6,y,PVFS_IO_
PVFS_error PVFS_isys_truncate(
PVFS_object_ref ref,
PVFS_size size,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sys_op_id *op_id,
void *user_ptr);
PVFS_error PVFS_sys_truncate(
PVFS_object_ref ref,
PVFS_size size,
- PVFS_credentials *credentials);
+ const PVFS_credentials *credentials);
PVFS_error PVFS_sys_getparent(
PVFS_fs_id fs_id,
char *entry_name,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_getparent *resp);
PVFS_error PVFS_isys_flush(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sys_op_id *op_id,
void *user_ptr);
PVFS_error PVFS_sys_flush(
PVFS_object_ref ref,
- PVFS_credentials *credentials);
+ const PVFS_credentials *credentials);
PVFS_error PVFS_isys_statfs(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_statfs *statfs,
PVFS_sys_op_id *op_id,
void *user_ptr);
PVFS_error PVFS_sys_statfs(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_statfs *resp);
PVFS_sys_dist* PVFS_sys_dist_lookup(
@@ -487,7 +488,7 @@ PVFS_error PVFS_sys_dist_setparam(
PVFS_error PVFS_isys_geteattr(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_ds_keyval *key_p,
PVFS_sysresp_geteattr *resp,
PVFS_sys_op_id *op_id,
@@ -495,13 +496,13 @@ PVFS_error PVFS_isys_geteattr(
PVFS_error PVFS_sys_geteattr(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_ds_keyval *key_p,
PVFS_ds_keyval *val_p);
PVFS_error PVFS_isys_geteattr_list(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
int32_t nkey,
PVFS_ds_keyval *key_p,
PVFS_sysresp_geteattr *resp,
@@ -510,14 +511,14 @@ PVFS_error PVFS_isys_geteattr_list(
PVFS_error PVFS_sys_geteattr_list(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
int32_t nkey,
PVFS_ds_keyval *key_p,
PVFS_sysresp_geteattr *resp);
PVFS_error PVFS_isys_seteattr(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_ds_keyval *key_p,
PVFS_ds_keyval *val_p,
int32_t flags,
@@ -526,14 +527,14 @@ PVFS_error PVFS_isys_seteattr(
PVFS_error PVFS_sys_seteattr(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_ds_keyval *key_p,
PVFS_ds_keyval *val_p,
int32_t flags);
PVFS_error PVFS_isys_seteattr_list(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
int32_t nkey,
PVFS_ds_keyval *key_array,
PVFS_ds_keyval *val_array,
@@ -543,7 +544,7 @@ PVFS_error PVFS_isys_seteattr_list(
PVFS_error PVFS_sys_seteattr_list(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
int32_t nkey,
PVFS_ds_keyval *key_array,
PVFS_ds_keyval *val_array,
@@ -551,21 +552,21 @@ PVFS_error PVFS_sys_seteattr_list(
PVFS_error PVFS_isys_deleattr(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_ds_keyval *key_p,
PVFS_sys_op_id *op_id,
void *user_ptr);
PVFS_error PVFS_sys_deleattr(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_ds_keyval *key_p);
PVFS_error PVFS_isys_listeattr(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t nkey,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_listeattr *resp,
PVFS_sys_op_id *op_id,
void *user_ptr);
@@ -574,7 +575,7 @@ PVFS_error PVFS_sys_listeattr(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t nkey,
- PVFS_credentials *credentials,
+ const PVFS_credentials *credentials,
PVFS_sysresp_listeattr *resp);
/* exported test functions for isys calls */
Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.130.2.1 -r1.130.2.2
--- pvfs2-types.h 18 Sep 2006 15:04:57 -0000 1.130.2.1
+++ pvfs2-types.h 19 Oct 2006 22:16:37 -0000 1.130.2.2
@@ -136,6 +136,7 @@ typedef uint32_t PVFS_uid;
typedef uint32_t PVFS_gid;
typedef uint64_t PVFS_time;
typedef uint32_t PVFS_permissions;
+typedef uint64_t PVFS_flags;
#define encode_PVFS_uid encode_uint32_t
#define decode_PVFS_uid decode_uint32_t
#define encode_PVFS_gid encode_uint32_t
@@ -144,6 +145,8 @@ typedef uint32_t PVFS_permissions;
#define decode_PVFS_time decode_int64_t
#define encode_PVFS_permissions encode_uint32_t
#define decode_PVFS_permissions decode_uint32_t
+#define encode_PVFS_flags encode_uint64_t
+#define decode_PVFS_flags decode_uint64_t
/* contiguous range of handles */
typedef struct
@@ -223,6 +226,11 @@ typedef enum
#define decode_PVFS_ds_type decode_enum
#define encode_PVFS_ds_type encode_enum
+/* PVFS Object Flags (PVFS_flags); Add more as we implement them */
+#define PVFS_IMMUTABLE_FL 0x1ULL
+#define PVFS_APPEND_FL 0x2ULL
+#define PVFS_NOATIME_FL 0x4ULL
+
/* Key/Value Pairs */
/* Extended attributes are stored on objects with */
/* a Key/Value pair. A key or a value is simply */
@@ -279,7 +287,8 @@ typedef struct
PVFS_ATTR_SYS_DIRENT_COUNT)
#define PVFS_ATTR_SYS_ALL_NOSIZE \
(PVFS_ATTR_SYS_COMMON_ALL | PVFS_ATTR_SYS_LNK_TARGET | \
- PVFS_ATTR_SYS_DFILE_COUNT | PVFS_ATTR_SYS_DIRENT_COUNT | PVFS_ATTR_SYS_DIR_HINT)
+ PVFS_ATTR_SYS_DFILE_COUNT | PVFS_ATTR_SYS_DIRENT_COUNT \
+ | PVFS_ATTR_SYS_DIR_HINT)
#define PVFS_ATTR_SYS_ALL_SETABLE \
(PVFS_ATTR_SYS_COMMON_ALL-PVFS_ATTR_SYS_TYPE)
#define PVFS_ATTR_SYS_ALL_TIMES \
@@ -529,7 +538,7 @@ PVFS_error PVFS_get_errno_mapping(PVFS_e
#define PVFS_EHOSTDOWN E(55) /* Host is down */
#define PVFS_EHOSTUNREACH E(56) /* No route to host */
#define PVFS_EALREADY E(57) /* Operation already in progress */
-#define PVFS_EACCES E(58) /* Operation already in progress */
+#define PVFS_EACCES E(58) /* Access not allowed */
/***************** non-errno/pvfs2 specific error codes *****************/
#define PVFS_ECANCEL (1|(PVFS_NON_ERRNO_ERROR_BIT|PVFS_ERROR_BIT))
Index: pvfs2-util.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-util.h,v
diff -p -u -r1.41.4.1 -r1.41.4.2
--- pvfs2-util.h 18 Sep 2006 15:04:57 -0000 1.41.4.1
+++ pvfs2-util.h 19 Oct 2006 22:16:37 -0000 1.41.4.2
@@ -45,7 +45,7 @@ int PVFS_util_get_umask(void);
credential object. returns NULL on failure.
*/
PVFS_credentials *PVFS_util_dup_credentials(
- PVFS_credentials *credentials);
+ const PVFS_credentials *credentials);
void PVFS_util_release_credentials(
PVFS_credentials *credentials);
More information about the Pvfs2-cvs
mailing list