[Pvfs2-cvs] commit by walt in pvfs2-1/src/client/sysint: mgmt-iterate-handles-list.sm sys-io.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/client/sysint
In directory parlweb1:/tmp/cvs-serv31068/src/client/sysint

Modified Files:
      Tag: Orange-Branch
	mgmt-iterate-handles-list.sm sys-io.sm 
Log Message:
merged Orange with Blue - first merging


Index: mgmt-iterate-handles-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/mgmt-iterate-handles-list.sm,v
diff -p -u -r1.32 -r1.32.10.1
--- mgmt-iterate-handles-list.sm	20 Nov 2008 01:16:49 -0000	1.32
+++ mgmt-iterate-handles-list.sm	14 Aug 2009 21:13:31 -0000	1.32.10.1
@@ -177,14 +177,16 @@ static PINT_sm_action mgmt_iterate_handl
     j=0;
     foreach_msgpair(&sm_p->msgarray_op, msg_p, i)
     {
-
+skipped:
 	/* skip servers that have already reached end */
 	/* TODO: use a better #define or something for ITERATE_END */
-	if(sm_p->u.iterate_handles_list.position_array[i]
+	if(sm_p->u.iterate_handles_list.position_array[j]
 	    == PVFS_ITERATE_END)
 	{
 	    sm_p->msgarray_op.count--;
-	    sm_p->u.iterate_handles_list.handle_count_array[i] = 0;
+	    sm_p->u.iterate_handles_list.handle_count_array[j] = 0;
+            j++;
+            goto skipped;
 	}
 	else
 	{
@@ -192,16 +194,16 @@ static PINT_sm_action mgmt_iterate_handl
                 msg_p->req,
 		*sm_p->cred_p,
 		sm_p->u.iterate_handles_list.fs_id,
-		sm_p->u.iterate_handles_list.handle_count_array[i],
-		sm_p->u.iterate_handles_list.position_array[i],
+		sm_p->u.iterate_handles_list.handle_count_array[j],
+		sm_p->u.iterate_handles_list.position_array[j],
                 sm_p->u.iterate_handles_list.flags,
 		sm_p->hints);
-	    j++;
 	    msg_p->fs_id = sm_p->u.iterate_handles_list.fs_id;
 	    msg_p->handle = PVFS_HANDLE_NULL;
 	    msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
 	    msg_p->comp_fn = iterate_handles_list_comp_fn;
-	    msg_p->svr_addr = sm_p->u.iterate_handles_list.addr_array[i];
+	    msg_p->svr_addr = sm_p->u.iterate_handles_list.addr_array[j];
+	    j++;
 	}
     }
 

Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/client/sysint/sys-io.sm,v
diff -p -u -r1.164.8.1 -r1.164.8.2
--- sys-io.sm	30 Apr 2009 15:02:59 -0000	1.164.8.1
+++ sys-io.sm	14 Aug 2009 21:13:31 -0000	1.164.8.2
@@ -467,9 +467,6 @@ static PINT_sm_action io_inspect_attr(
 static PINT_sm_action io_unstuff_setup_msgpair(
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
-
- gossip_err("Executing io_unstuff_setup_msgpair....\n");
-
     struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     int ret = -PVFS_EINVAL;
     PINT_sm_msgpair_state *msg_p = NULL;
@@ -793,10 +790,6 @@ static PINT_sm_action io_datafile_post_m
                      status_user_tag, msg->max_resp_sz);
 
         cur_ctx->session_tag = PINT_util_get_next_tag();
-
-        gossip_err("CLIENT: SYS-IO SM: cur_ctx->session_tag:%d",cur_ctx->session_tag);
-
-
         cur_ctx->msg_recv_has_been_posted = 0;
         cur_ctx->msg_recv_in_progress = 0;