[Pvfs2-cvs] commit by nlmills in pvfs2/src/io/flow/flowproto-bmi-cache: flowproto-bmi-cache-server.c

[CVS commit program]

Update of /anoncvs/pvfs2/src/io/flow/flowproto-bmi-cache
In directory parlweb1:/tmp/cvs-serv5511/src/io/flow/flowproto-bmi-cache

Modified Files:
      Tag: cu-security-branch
	flowproto-bmi-cache-server.c 
Log Message:
merged in changes from summer at LANL


Index: flowproto-bmi-cache-server.c
===================================================================
RCS file: /anoncvs/pvfs2/src/io/flow/flowproto-bmi-cache/flowproto-bmi-cache-server.c,v
diff -p -u -r1.17 -r1.17.36.1
--- flowproto-bmi-cache-server.c	27 May 2006 23:52:21 -0000	1.17
+++ flowproto-bmi-cache-server.c	25 Aug 2009 17:56:15 -0000	1.17.36.1
@@ -221,7 +221,7 @@ int fp_bmi_cache_initialize(int flowprot
     ret = PINT_thread_mgr_bmi_start();
     if(ret < 0)
 	return(ret);
-    PINT_thread_mgr_bmi_getcontext(&global_bmi_context);
+    PINT_thread_mgr_bmi_getcontext((PVFS_context_id *)&global_bmi_context);
 
     return(0);
 }
@@ -312,7 +312,6 @@ int fp_bmi_cache_post(flow_descriptor * 
 			fprintf(stderr, "TROVE_open_context() failure.\n");
 			return (-1);
 		}
-		fprintf(stderr, "collid:%d, trove_context:%d\n", flow_d->dest.u.trove.coll_id, global_trove_context);
 
 		ret = cache_init(&info);
 		if ( ret < 0 )
@@ -870,7 +869,8 @@ static void cache_write_callback_fn(void
 		q_item->cache_req.buffer_type,
         	q_item->parent->tag,
         	&q_item->bmi_callback,
-        	global_bmi_context);
+        	global_bmi_context,
+		q_item->parent->hints);
 
 	/* TODO: error handling */
 	assert(ret >= 0);
@@ -941,7 +941,8 @@ static void cache_read_callback_fn(void 
 		q_item->cache_req.buffer_type,
 		q_item->parent->tag,
 		&q_item->bmi_callback,
-		global_bmi_context);
+		global_bmi_context,
+		(bmi_hint)q_item->parent->hints);
 		
 	/* TODO: error handling */
 	assert(ret >= 0);