[PVFS2-CVS] commit by neill in pvfs2/src/client/sysint: client-state-machine.c sys-create.sm sys-dist.c sys-flush.sm sys-getattr.sm sys-io.sm sys-lookup.sm sys-mkdir.sm sys-readdir.sm sys-remove.sm sys-rename.sm sys-setattr.sm sys-symlink.sm sys-truncate.sm

CVS commit program cvs at parl.clemson.edu
Mon Oct 25 12:25:10 EDT 2004


Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv30883/src/client/sysint

Modified Files:
	client-state-machine.c sys-create.sm sys-dist.c sys-flush.sm 
	sys-getattr.sm sys-io.sm sys-lookup.sm sys-mkdir.sm 
	sys-readdir.sm sys-remove.sm sys-rename.sm sys-setattr.sm 
	sys-symlink.sm sys-truncate.sm 
Log Message:
- sysint error code type conversion to PVFS_error (instead of int)


Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.66 -r1.67
--- client-state-machine.c	5 Oct 2004 16:39:37 -0000	1.66
+++ client-state-machine.c	25 Oct 2004 15:25:09 -0000	1.67
@@ -48,7 +48,7 @@ do {                                    
 #define CLIENT_SM_ASSERT_INITIALIZED()  \
 do { assert(got_context); } while(0)
 
-static int add_sm_to_completion_list(PINT_client_sm *sm_p)
+static PVFS_error add_sm_to_completion_list(PINT_client_sm *sm_p)
 {
     gen_mutex_lock(&s_completion_list_mutex);
     assert(s_completion_list_index < MAX_RETURNED_JOBS);
@@ -82,7 +82,7 @@ static int conditional_remove_sm_if_in_c
     return found;
 }
 
-static int completion_list_retrieve_completed(
+static PVFS_error completion_list_retrieve_completed(
     PVFS_sys_op_id *op_id_array,
     void **user_ptr_array,
     int *error_code_array,
@@ -195,13 +195,13 @@ static inline int cancelled_io_jobs_are_
   you need to call PVFS_sys_release on your own when the operation
   completes.
 */
-int PINT_client_state_machine_post(
+PVFS_error PINT_client_state_machine_post(
     PINT_client_sm *sm_p,
     int pvfs_sys_op,
     PVFS_sys_op_id *op_id,
     void *user_ptr /* in */)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     job_status_s js;
 
 #if 0
@@ -368,13 +368,13 @@ int PINT_client_state_machine_post(
     return ret;
 }
 
-int PINT_sys_dev_unexp(
+PVFS_error PINT_sys_dev_unexp(
     struct PINT_dev_unexp_info *info,
     job_status_s *jstat,
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     job_id_t id;
     PINT_client_sm *sm_p = NULL;
 
@@ -419,9 +419,10 @@ int PINT_sys_dev_unexp(
  *
  * returns 0 on success, -PVFS_error on failure
  */
-int PINT_client_io_cancel(PVFS_sys_op_id id)
+PVFS_error PINT_client_io_cancel(PVFS_sys_op_id id)
 {
-    int ret = -PVFS_EINVAL, i = 0;
+    int i = 0;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PINT_client_io_cancel called\n");
@@ -529,11 +530,12 @@ int PINT_client_io_cancel(PVFS_sys_op_id
     return ret;
 }
 
-int PINT_client_state_machine_test(
+PVFS_error PINT_client_state_machine_test(
     PVFS_sys_op_id op_id,
     int *error_code)
 {
-    int ret = -PVFS_EINVAL, i = 0, job_count = 0;
+    int i = 0, job_count = 0;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p, *tmp_sm_p = NULL;
     job_id_t job_id_array[MAX_RETURNED_JOBS];
     job_status_s job_status_array[MAX_RETURNED_JOBS];
@@ -624,15 +626,15 @@ int PINT_client_state_machine_test(
     return 0;
 }
 
-int PINT_client_state_machine_testsome(
+PVFS_error PINT_client_state_machine_testsome(
     PVFS_sys_op_id *op_id_array,
     int *op_count, /* in/out */
     void **user_ptr_array,
     int *error_code_array,
     int timeout_ms)
 {
-    int ret = -PVFS_EINVAL, i = 0;
-    int limit = 0, job_count = 0;
+    PVFS_error ret = -PVFS_EINVAL;
+    int i = 0, limit = 0, job_count = 0;
     PINT_client_sm *sm_p = NULL;
     job_id_t job_id_array[MAX_RETURNED_JOBS];
     job_status_s job_status_array[MAX_RETURNED_JOBS];
@@ -733,13 +735,13 @@ int PINT_client_state_machine_testsome(
         op_id_array, user_ptr_array, error_code_array, limit, op_count);
 }
 
-int PINT_client_wait_internal(
+PVFS_error PINT_client_wait_internal(
     PVFS_sys_op_id op_id,
     const char *in_op_str,
     int *out_error,
     const char *in_class_str)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     if (in_op_str && out_error && in_class_str)

Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.66 -r1.67
--- sys-create.sm	13 Oct 2004 21:02:59 -0000	1.66
+++ sys-create.sm	25 Oct 2004 15:25:09 -0000	1.67
@@ -216,7 +216,7 @@ machine pvfs2_client_create_sm(
 
 %%
 
-int PVFS_isys_create(
+PVFS_error PVFS_isys_create(
     char *object_name,
     PVFS_object_ref parent_ref,
     PVFS_sys_attr attr,
@@ -226,8 +226,8 @@ int PVFS_isys_create(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
-    int num_dfiles_req;
+    int num_dfiles_req = 0;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_create entered\n");
@@ -337,7 +337,7 @@ int PVFS_isys_create(
         sm_p, PVFS_SYS_CREATE, op_id, user_ptr);
 }
 
-int PVFS_sys_create(
+PVFS_error PVFS_sys_create(
     char *object_name,
     PVFS_object_ref parent_ref,
     PVFS_sys_attr attr,
@@ -345,8 +345,7 @@ int PVFS_sys_create(
     PVFS_sys_dist *dist,
     PVFS_sysresp_create *resp)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_create entered\n");

Index: sys-dist.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-dist.c,v
diff -p -u -r1.3 -r1.4
--- sys-dist.c	28 Jul 2004 14:32:32 -0000	1.3
+++ sys-dist.c	25 Oct 2004 15:25:10 -0000	1.4
@@ -56,7 +56,7 @@ PVFS_sys_dist* PVFS_sys_dist_lookup(cons
 /**
  * Free resources associated with this distribution
  */
-int PVFS_sys_dist_free(PVFS_sys_dist* dist)
+PVFS_error PVFS_sys_dist_free(PVFS_sys_dist* dist)
 {
     if (0 != dist)
     {
@@ -70,12 +70,12 @@ int PVFS_sys_dist_free(PVFS_sys_dist* di
 /**
  * Set the named distribution parameter with the given value
  */
-int PVFS_sys_dist_setparam(
+PVFS_error PVFS_sys_dist_setparam(
     PVFS_sys_dist* dist,
     const char* param,
     void* value)
 {
-    int rc = -PVFS_EINVAL;
+    PVFS_error rc = -PVFS_EINVAL;
     if (0 != dist)
     {
         /* Construct a dummy dist to lookup the registered dist */

Index: sys-flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-flush.sm,v
diff -p -u -r1.25 -r1.26
--- sys-flush.sm	29 Jul 2004 20:38:57 -0000	1.25
+++ sys-flush.sm	25 Oct 2004 15:25:10 -0000	1.26
@@ -87,13 +87,13 @@ machine pvfs2_client_flush_sm(
 
 %%
 
-int PVFS_isys_flush(
+PVFS_error PVFS_isys_flush(
     PVFS_object_ref ref,
     PVFS_credentials *credentials,
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_flush entered\n");
@@ -127,12 +127,11 @@ int PVFS_isys_flush(
         sm_p, PVFS_SYS_FLUSH, op_id, user_ptr);
 }
 
-int PVFS_sys_flush(
+PVFS_error PVFS_sys_flush(
     PVFS_object_ref ref,
     PVFS_credentials *credentials)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_flush entered\n");

Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.77 -r1.78
--- sys-getattr.sm	14 Oct 2004 18:08:01 -0000	1.77
+++ sys-getattr.sm	25 Oct 2004 15:25:10 -0000	1.78
@@ -121,7 +121,7 @@ machine pvfs2_client_getattr_sm(
 
 %%
 
-int PVFS_isys_getattr(
+PVFS_error PVFS_isys_getattr(
     PVFS_object_ref ref,
     uint32_t attrmask, 
     PVFS_credentials *credentials,
@@ -129,7 +129,7 @@ int PVFS_isys_getattr(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_getattr entered\n");
@@ -165,14 +165,13 @@ int PVFS_isys_getattr(
         sm_p, PVFS_SYS_GETATTR, op_id, user_ptr);
 }
 
-int PVFS_sys_getattr(
+PVFS_error PVFS_sys_getattr(
     PVFS_object_ref ref,
     uint32_t attrmask, 
     PVFS_credentials *credentials,
     PVFS_sysresp_getattr *resp_p)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_getattr entered\n");

Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.105 -r1.106
--- sys-io.sm	18 Oct 2004 19:42:02 -0000	1.105
+++ sys-io.sm	25 Oct 2004 15:25:10 -0000	1.106
@@ -179,7 +179,7 @@ machine pvfs2_client_io_sm(
 
 %%
 
-int PVFS_isys_io(
+PVFS_error PVFS_isys_io(
     PVFS_object_ref ref,
     PVFS_Request file_req,
     PVFS_offset file_req_offset,
@@ -191,7 +191,7 @@ int PVFS_isys_io(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
     struct filesystem_configuration_s* cur_fs = NULL;
     struct server_configuration_s *server_config = NULL;
@@ -261,7 +261,7 @@ int PVFS_isys_io(
         sm_p, PVFS_SYS_IO, op_id, user_ptr);
 }
 
-int PVFS_sys_io(
+PVFS_error PVFS_sys_io(
     PVFS_object_ref ref,
     PVFS_Request file_req,
     PVFS_offset file_req_offset,
@@ -271,8 +271,7 @@ int PVFS_sys_io(
     PVFS_sysresp_io *resp_p,
     enum PVFS_io_type io_type)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_io entered\n");

Index: sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.51 -r1.52
--- sys-lookup.sm	14 Oct 2004 18:08:01 -0000	1.51
+++ sys-lookup.sm	25 Oct 2004 15:25:10 -0000	1.52
@@ -455,7 +455,7 @@ static void finalize_context(
 
 /****************************************************************/
 
-int PVFS_isys_ref_lookup(
+PVFS_error PVFS_isys_ref_lookup(
     PVFS_fs_id fs_id,
     char* relative_pathname,
     PVFS_object_ref parent,
@@ -465,7 +465,7 @@ int PVFS_isys_ref_lookup(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_ref_lookup entered\n");
@@ -510,7 +510,7 @@ int PVFS_isys_ref_lookup(
         sm_p, PVFS_SYS_LOOKUP, op_id, user_ptr);
 }
 
-int PVFS_sys_ref_lookup(
+PVFS_error PVFS_sys_ref_lookup(
     PVFS_fs_id fs_id,
     char *relative_pathname,
     PVFS_object_ref parent,
@@ -518,8 +518,7 @@ int PVFS_sys_ref_lookup(
     PVFS_sysresp_lookup *resp,
     int follow_link)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_ref_lookup entered\n");
@@ -548,13 +547,13 @@ int PVFS_sys_ref_lookup(
 }
 
 /* NOTE: no non-blocking equivalent for now */
-int PVFS_sys_lookup(
+PVFS_error PVFS_sys_lookup(
     PVFS_fs_id fs_id, char *name,
     PVFS_credentials *credentials,
     PVFS_sysresp_lookup *resp,
     int follow_link)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PVFS_object_ref parent;
 
     if (name && resp)

Index: sys-mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-mkdir.sm,v
diff -p -u -r1.40 -r1.41
--- sys-mkdir.sm	13 Oct 2004 21:03:00 -0000	1.40
+++ sys-mkdir.sm	25 Oct 2004 15:25:10 -0000	1.41
@@ -155,7 +155,7 @@ machine pvfs2_client_mkdir_sm(
 
 %%
 
-int PVFS_isys_mkdir(
+PVFS_error PVFS_isys_mkdir(
     char *object_name,
     PVFS_object_ref parent_ref,
     PVFS_sys_attr attr,
@@ -164,7 +164,7 @@ int PVFS_isys_mkdir(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_mkdir entered\n");
@@ -217,15 +217,14 @@ int PVFS_isys_mkdir(
         sm_p, PVFS_SYS_MKDIR, op_id, user_ptr);
 }
 
-int PVFS_sys_mkdir(
+PVFS_error PVFS_sys_mkdir(
     char *object_name,
     PVFS_object_ref parent_ref,
     PVFS_sys_attr attr,
     PVFS_credentials *credentials,
     PVFS_sysresp_mkdir *resp)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_mkdir entered\n");

Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.33 -r1.34
--- sys-readdir.sm	20 Oct 2004 14:15:52 -0000	1.33
+++ sys-readdir.sm	25 Oct 2004 15:25:10 -0000	1.34
@@ -100,7 +100,7 @@ machine pvfs2_client_readdir_sm(
 
 %%
 
-int PVFS_isys_readdir(
+PVFS_error PVFS_isys_readdir(
     PVFS_object_ref ref,
     PVFS_ds_position token, 
     int pvfs_dirent_incount,
@@ -109,7 +109,7 @@ int PVFS_isys_readdir(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_readdir entered\n");
@@ -151,15 +151,14 @@ int PVFS_isys_readdir(
         sm_p, PVFS_SYS_READDIR, op_id, user_ptr);
 }
 
-int PVFS_sys_readdir(
+PVFS_error PVFS_sys_readdir(
     PVFS_object_ref ref,
     PVFS_ds_position token, 
     int pvfs_dirent_incount,
     PVFS_credentials *credentials,
     PVFS_sysresp_readdir *resp)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_readdir entered\n");

Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.84 -r1.85
--- sys-remove.sm	14 Oct 2004 18:08:02 -0000	1.84
+++ sys-remove.sm	25 Oct 2004 15:25:10 -0000	1.85
@@ -174,14 +174,14 @@ machine pvfs2_client_remove_sm(
 
 %%
 
-int PVFS_isys_remove(
+PVFS_error PVFS_isys_remove(
     char *object_name,
     PVFS_object_ref parent_ref, 
     PVFS_credentials *credentials,
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_remove entered\n");
@@ -215,13 +215,12 @@ int PVFS_isys_remove(
         sm_p, PVFS_SYS_REMOVE, op_id, user_ptr);
 }
 
-int PVFS_sys_remove(
+PVFS_error PVFS_sys_remove(
     char *object_name,
     PVFS_object_ref parent_ref, 
     PVFS_credentials *credentials)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_remove entered\n");

Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.33 -r1.34
--- sys-rename.sm	20 Oct 2004 14:50:19 -0000	1.33
+++ sys-rename.sm	25 Oct 2004 15:25:10 -0000	1.34
@@ -233,7 +233,7 @@ machine pvfs2_client_rename_sm(
  *
  * returns 0 on success, -errno on failure
  */
-int PVFS_isys_rename(
+PVFS_error PVFS_isys_rename(
     char *old_entry,
     PVFS_object_ref old_parent_ref,
     char *new_entry,
@@ -242,7 +242,7 @@ int PVFS_isys_rename(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_rename entered\n");
@@ -309,15 +309,14 @@ int PVFS_isys_rename(
         sm_p, PVFS_SYS_RENAME, op_id, user_ptr);
 }
 
-int PVFS_sys_rename(
+PVFS_error PVFS_sys_rename(
     char *old_entry,
     PVFS_object_ref old_parent_ref,
     char *new_entry,
     PVFS_object_ref new_parent_ref,
     PVFS_credentials *credentials)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_rename entered\n");

Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.31 -r1.32
--- sys-setattr.sm	4 Oct 2004 16:46:28 -0000	1.31
+++ sys-setattr.sm	25 Oct 2004 15:25:10 -0000	1.32
@@ -100,14 +100,14 @@ machine pvfs2_client_setattr_sm(
 
 %%
 
-int PVFS_isys_setattr(
+PVFS_error PVFS_isys_setattr(
     PVFS_object_ref ref,
     PVFS_sys_attr attr,
     PVFS_credentials *credentials,
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_setattr entered\n");
@@ -151,13 +151,12 @@ int PVFS_isys_setattr(
 }
 
 
-int PVFS_sys_setattr(
+PVFS_error PVFS_sys_setattr(
     PVFS_object_ref ref,
     PVFS_sys_attr attr,
     PVFS_credentials *credentials)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_setattr entered\n");

Index: sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.46 -r1.47
--- sys-symlink.sm	13 Oct 2004 21:03:00 -0000	1.46
+++ sys-symlink.sm	25 Oct 2004 15:25:10 -0000	1.47
@@ -184,7 +184,7 @@ machine pvfs2_client_symlink_sm(
 
 %%
 
-int PVFS_isys_symlink(
+PVFS_error PVFS_isys_symlink(
     char *entry_name,
     PVFS_object_ref parent_ref,
     char *target,
@@ -194,7 +194,7 @@ int PVFS_isys_symlink(
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_symlink entered\n");
@@ -251,7 +251,7 @@ int PVFS_isys_symlink(
         sm_p, PVFS_SYS_SYMLINK, op_id, user_ptr);
 }
 
-int PVFS_sys_symlink(
+PVFS_error PVFS_sys_symlink(
     char *entry_name,
     PVFS_object_ref parent_ref,
     char *target,
@@ -259,8 +259,7 @@ int PVFS_sys_symlink(
     PVFS_credentials *credentials,
     PVFS_sysresp_symlink *resp)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_symlink entered\n");

Index: sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.35 -r1.36
--- sys-truncate.sm	4 Oct 2004 18:08:46 -0000	1.35
+++ sys-truncate.sm	25 Oct 2004 15:25:10 -0000	1.36
@@ -88,14 +88,14 @@ machine pvfs2_client_truncate_sm(
 
 %%
 
-int PVFS_isys_truncate(
+PVFS_error PVFS_isys_truncate(
     PVFS_object_ref ref,
     PVFS_size size,
     PVFS_credentials *credentials,
     PVFS_sys_op_id *op_id,
     void *user_ptr)
 {
-    int ret = -PVFS_EINVAL;
+    PVFS_error ret = -PVFS_EINVAL;
     PINT_client_sm *sm_p = NULL;
 
     if ((ref.fs_id == PVFS_FS_ID_NULL) ||
@@ -131,13 +131,12 @@ int PVFS_isys_truncate(
         sm_p, PVFS_SYS_TRUNCATE, op_id, user_ptr);
 }
 
-int PVFS_sys_truncate(
+PVFS_error PVFS_sys_truncate(
     PVFS_object_ref ref,
     PVFS_size size,
     PVFS_credentials *credentials)
 {
-    int ret = -PVFS_EINVAL;
-    PVFS_error error;
+    PVFS_error ret = -PVFS_EINVAL, error = 0;
     PVFS_sys_op_id op_id;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG,



More information about the PVFS2-CVS mailing list