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

CVS commit program cvs at parl.clemson.edu
Mon Jan 9 16:59:34 EST 2006


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

Modified Files:
	pvfs2-req-proto.h 
Log Message:
fix for the read request size being sent in small_io operation.  The displayed error this fixes is:  pint_request.c line 89: PINT_process_request: NULL segmax or bytemax!



Index: pvfs2-req-proto.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/proto/pvfs2-req-proto.h,v
diff -p -u -r1.135 -r1.136
--- pvfs2-req-proto.h	7 Jan 2006 02:47:47 -0000	1.135
+++ pvfs2-req-proto.h	9 Jan 2006 21:59:34 -0000	1.136
@@ -1018,7 +1018,8 @@ struct PVFS_servreq_small_io
                                    __dist,                               \
                                    __filereq,                            \
                                    __filereq_offset,                     \
-                                   __segments)                           \
+                                   __segments,                           \
+                                   __bytes)                              \
 do {                                                                     \
     int _sio_i;                                                          \
     (__req).op                                = PVFS_SERV_SMALL_IO;      \
@@ -1032,10 +1033,12 @@ do {                                    
     (__req).u.small_io.file_req               = (__filereq);             \
     (__req).u.small_io.file_req_offset        = (__filereq_offset);      \
     (__req).u.small_io.segments               = (__segments);            \
-    (__req).u.small_io.total_bytes            = 0;                       \
+    (__req).u.small_io.total_bytes            =                          \
+        ((__io_type) == PVFS_IO_WRITE) ? 0 : (__bytes);                  \
     for(_sio_i = 0; _sio_i < (__segments); ++_sio_i)                     \
     {                                                                    \
-        (__req).u.small_io.total_bytes += (__req).u.small_io.sizes[_sio_i]; \
+        (__req).u.small_io.total_bytes +=                                \
+            (__req).u.small_io.sizes[_sio_i];                            \
     }                                                                    \
 } while(0)
 



More information about the PVFS2-CVS mailing list