[Pvfs2-cvs] commit by wligon in pvfs2/src/client/sysint: client-state-machine.h mgmt-migrate.sm

[CVS commit program]

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

Modified Files:
      Tag: Orange-Migrate-Tools
	client-state-machine.h mgmt-migrate.sm 
Log Message:



Index: client-state-machine.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.177.10.4.2.1 -r1.177.10.4.2.2
--- client-state-machine.h	27 May 2010 19:00:25 -0000	1.177.10.4.2.1
+++ client-state-machine.h	8 Jun 2010 17:31:01 -0000	1.177.10.4.2.2
@@ -145,7 +145,10 @@ struct PINT_client_mgmt_get_dirdata_hand
     PVFS_handle *dirdata_handle;
 };
 
-struct PINT_client_migrate_sm{};
+struct PINT_client_migrate_sm
+{
+    const char *dist_server;
+};
 
 /* this structure is used to handle mirrored retries in the small-io case*/
 typedef struct PINT_client_mirror_ctx

Index: mgmt-migrate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/Attic/mgmt-migrate.sm,v
diff -p -u -r1.1.6.4 -r1.1.6.5
--- mgmt-migrate.sm	2 Jun 2010 15:35:38 -0000	1.1.6.4
+++ mgmt-migrate.sm	8 Jun 2010 17:31:01 -0000	1.1.6.5
@@ -58,6 +58,7 @@ PVFS_error PVFS_imgmt_migrate(
 		PVFS_object_ref ref,
 		const PVFS_credentials *credentials,
 		PVFS_sys_op_id *op_id,
+                const char *dist_ser,
 		PVFS_hint hints,
 		void *user_ptr)
 {
@@ -92,7 +93,7 @@ PVFS_error PVFS_imgmt_migrate(
     PINT_init_sysint_credentials(sm->cred_p, credentials);
     
     /* fill in stuff in the union */
-    
+    sm_p->u.migrate.dist_server = dist_ser;
     sm_p->error_code = 0;
     sm_p->object_ref = ref;
     PVFS_hint_copy(hints, &sm_p->hints);
@@ -105,6 +106,7 @@ PVFS_error PVFS_imgmt_migrate(
 PVFS_error PVFS_mgmt_migrate(
 		PVFS_object_ref ref,
 		const PVFS_credentials *credentials,
+                const char *dist_server,
 		PVFS_hint hints)
 {
 	PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -112,7 +114,7 @@ PVFS_error PVFS_mgmt_migrate(
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_mgmt_migrate entered\n");		
 			
-	ret = PVFS_imgmt_migrate(credentials, &op_id, hints)
+	ret = PVFS_imgmt_migrate(credentials, &op_id, dist_server, hints)
 	if(ret)
 	{
 		PVFS_perror_gossip("PVFS_imgmt_migrate call", ret);
@@ -167,15 +169,18 @@ static PINT_sm_action mgmt_migrate_setup
 	PINT_msgpair_init(&sm_p->msgarray_op);
 	msg_p = &sm_p->msgarray_op.msgpair;
 	
-	PINT_SERVREQ_MGMT_MIGRATE_FILL(    //need to do this right here!!!!!!!!!
+	PINT_SERVREQ_MGMT_MIGRATE_FILL( 
 	    msg_p->req,
 	    *sm_p->cred_p,
-	    sm_p->parent_ref.fs_id,
-	    sm_p->parent_ref.handle,
+	    sm_p->object_ref.fs_id,
+	    sm_p->object_ref.handle,
+            sm_p->u.migrate.dist_server,
     	sm_p->hints);
     
     /*stuff here as well */
-    
+        msg_p->fs_id = sm_p->object_ref.fs_id;
+        msg_p->handle = sm_p->object_re.handle;
+        msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY; 
   	msg_p->comp_fn = mgmt_migrate_comp_fn;
   	   	
    	ret = PINT_cached_config_map_to_server(
@@ -217,4 +222,4 @@ static PINT_sm_action mgmt_migrate_clean
  * End:
  *
  * vim: ft=c ts=8 sts=4 sw=4 expandtab
- */		
\ No newline at end of file
+ */