[Pvfs2-cvs] commit by slang in pvfs2/src/io/flow/flowproto-bmi-trove: flowproto-multiqueue.c

CVS commit program cvs at parl.clemson.edu
Wed Apr 11 18:50:39 EDT 2007


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

Modified Files:
      Tag: WALT3
	flowproto-multiqueue.c 
Log Message:
walt3 reverse merge from head includes merges of pw's sm changes (no state declarations), cleanup of state machine code, and other general merging/fixes.


Index: flowproto-multiqueue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c,v
diff -p -u -r1.110.4.2 -r1.110.4.3
--- flowproto-multiqueue.c	19 Oct 2006 22:16:59 -0000	1.110.4.2
+++ flowproto-multiqueue.c	11 Apr 2007 22:50:38 -0000	1.110.4.3
@@ -471,7 +471,10 @@ int fp_multiqueue_cancel(flow_descriptor
                      "%s: called on active flow, %lld bytes transferred.\n",
                      __func__, lld(flow_d->total_transferred));
         assert(flow_d->state == FLOW_TRANSMITTING);
-        handle_io_error(-PVFS_ECANCEL, NULL, flow_data);
+        /* NOTE: set flow error class bit so that system interface understands
+         * that this may be a retry-able error
+         */
+        handle_io_error(-(PVFS_ECANCEL|PVFS_ERROR_FLOW), NULL, flow_data);
         if(flow_data->parent->state == FLOW_COMPLETE)
         {
             gen_mutex_unlock(flow_data->parent->flow_mutex);



More information about the Pvfs2-cvs mailing list