[PVFS2-CVS] commit by neill in pvfs2/src/io/flow/flowproto-bmi-trove: flowproto-multiqueue.c

CVS commit program cvs at parl.clemson.edu
Thu Jul 8 13:17:11 EDT 2004


Update of /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove
In directory parlweb:/tmp/cvs-serv12211/src/io/flow/flowproto-bmi-trove

Modified Files:
	flowproto-multiqueue.c 
Log Message:
- merging in the pvfs2-nm-nb-branch with the main tree
  see ChangeLog for details, or browse the cvs history of the branch
  for full details


Index: flowproto-multiqueue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c,v
diff -p -u -r1.84 -r1.85
--- flowproto-multiqueue.c	28 Apr 2004 18:08:15 -0000	1.84
+++ flowproto-multiqueue.c	8 Jul 2004 16:17:10 -0000	1.85
@@ -231,6 +231,11 @@ static inline void bmi_to_mem_callback_w
 {
     struct fp_private_data* flow_data = 
 	PRIVATE_FLOW(((struct fp_queue_item*)user_ptr)->parent);
+
+    assert(flow_data);
+    assert(flow_data->parent);
+    assert(flow_data->parent->flow_mutex);
+
     gen_mutex_lock(flow_data->parent->flow_mutex);
     bmi_to_mem_callback_fn(user_ptr, actual_size, error_code);
     if(flow_data->parent->state == FLOW_COMPLETE)



More information about the PVFS2-CVS mailing list