[PVFS2-CVS] commit by slang in pvfs2/src/proto: pvfs2-req-proto.h

CVS commit program cvs at parl.clemson.edu
Thu Nov 17 18:04:45 EST 2005


Update of /projects/cvsroot/pvfs2/src/proto
In directory parlweb:/tmp/cvs-serv21766/src/proto

Modified Files:
      Tag: slang-sio-branch
	pvfs2-req-proto.h 
Log Message:
fixed a bug in flow caused by outsize being updated correctly in trove now.  Also, s/transfered/transferred/.


Index: pvfs2-req-proto.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/proto/pvfs2-req-proto.h,v
diff -p -u -r1.131.2.2 -r1.131.2.3
--- pvfs2-req-proto.h	4 Nov 2005 15:42:10 -0000	1.131.2.2
+++ pvfs2-req-proto.h	17 Nov 2005 23:04:44 -0000	1.131.2.3
@@ -924,7 +924,7 @@ endecode_fields_1_struct(
 /* write operations require a second response to announce completion */
 struct PVFS_servresp_write_completion
 {
-    PVFS_size total_completed; /* amount of data transfered */
+    PVFS_size total_completed; /* amount of data transferred */
 };
 endecode_fields_1_struct(
     PVFS_servresp_write_completion,
@@ -971,15 +971,13 @@ struct PVFS_servreq_small_io
     if ((x)->io_type == PVFS_IO_WRITE) \
     { \
         int i = 0; \
-        int total_offset = 0; \
         for(; i < (x)->segments; ++i) \
         { \
-            memcpy((*pptr) + total_offset, \
+            memcpy((*pptr), \
                    (char *)(x)->buffer + ((x)->offsets[i]), \
                    (x)->sizes[i]); \
-            total_offset = (x)->offsets[i] + (x)->sizes[i]; \
+            (*pptr) += (x)->sizes[i]; \
         } \
-        (*pptr) += total_offset; \
     } \
 } while (0)
 



More information about the PVFS2-CVS mailing list