[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/io/flow: flow.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/io/flow
In directory parlweb1:/tmp/cvs-serv15832/src/io/flow

Modified Files:
      Tag: pvfs-2-8-branch
	flow.h 
Log Message:
merge flow deadlock bugfix from trunk to 2-8 branch


Index: flow.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/flow/flow.h,v
diff -p -u -r1.38 -r1.38.2.1
--- flow.h	20 Nov 2008 01:16:59 -0000	1.38
+++ flow.h	6 Nov 2009 18:09:41 -0000	1.38.2.1
@@ -99,7 +99,7 @@ struct flow_descriptor
     /* fields that can be set publicly before posting */
 
     /* function to be triggered upon completion */
-    void(*callback)(struct flow_descriptor* flow_d);
+    void(*callback)(struct flow_descriptor* flow_d, int cancel_path);
 
     struct flow_endpoint src;	/* src endpoint */
     struct flow_endpoint dest;	/* dest endpoint */