[Pvfs2-cvs] commit by kunkel in
pvfs2/src/io/flow/flowproto-bmi-trove: flowproto-multiqueue.c
CVS commit program
cvs at parl.clemson.edu
Wed May 23 16:49:09 EDT 2007
Update of /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove
In directory parlweb1:/tmp/cvs-serv20193/src/io/flow/flowproto-bmi-trove
Modified Files:
Tag: pvfs2-kunkel-tas-branch
flowproto-multiqueue.c
Log Message:
Merge HEAD changes to TAS-branch.
Index: flowproto-multiqueue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c,v
diff -p -u -r1.115 -r1.115.4.1
--- flowproto-multiqueue.c 19 Sep 2006 21:36:11 -0000 1.115
+++ flowproto-multiqueue.c 23 May 2007 20:49:09 -0000 1.115.4.1
@@ -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