[Pvfs2-cvs] commit by slang in pvfs2/src/apps/kernel/linux: pvfs2-client-core.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/apps/kernel/linux
In directory parlweb1:/tmp/cvs-serv10385/src/apps/kernel/linux

Modified Files:
      Tag: pvfs-2-6-branch
	pvfs2-client-core.c 
Log Message:
Commit of Murali's patch.  See: http://www.beowulf-underground.org/pipermail/pvfs2-users/2007-January/001690.html


Index: pvfs2-client-core.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client-core.c,v
diff -p -u -r1.77.6.4 -r1.77.6.5
--- pvfs2-client-core.c	14 Dec 2006 05:23:54 -0000	1.77.6.4
+++ pvfs2-client-core.c	9 Jan 2007 07:21:26 -0000	1.77.6.5
@@ -1416,7 +1416,7 @@ static PVFS_error post_io_readahead_requ
 
     assert((vfs_request->in_upcall.req.io.buf_index > -1) &&
            (vfs_request->in_upcall.req.io.buf_index <
-            pvfs2_bufmap_desc_count));
+            s_desc_params[BM_IO].dev_buffer_count));
 
     vfs_request->io_tmp_buf = malloc(
         vfs_request->in_upcall.req.io.readahead_size);
@@ -1563,7 +1563,7 @@ static PVFS_error post_io_request(vfs_re
 
     assert((vfs_request->in_upcall.req.io.buf_index > -1) &&
            (vfs_request->in_upcall.req.io.buf_index <
-            s_desc_params[BM_IO].dev_buffer_size));
+            s_desc_params[BM_IO].dev_buffer_count));
 
     /* get a shared kernel/userspace buffer for the I/O transfer */
     vfs_request->io_kernel_mapped_buf = 
@@ -1639,7 +1639,7 @@ static PVFS_error post_iox_request(vfs_r
 
     if ((vfs_request->in_upcall.req.iox.buf_index < 0) ||
            (vfs_request->in_upcall.req.iox.buf_index >= 
-            s_desc_params[BM_IO].dev_buffer_size))
+            s_desc_params[BM_IO].dev_buffer_count))
     {
         gossip_err("post_iox_request: invalid buffer index %d\n",
                 vfs_request->in_upcall.req.iox.buf_index);
@@ -2373,7 +2373,7 @@ static inline void package_downcall_memb
                     assert(buf);
 
                     /* copy cached data into the shared user/kernel space */
-                    memcpy(buf, (vfs_request->io_tmp_buf +
+                    memcpy(buf, ((char *) vfs_request->io_tmp_buf +
                                  vfs_request->in_upcall.req.io.offset),
                            vfs_request->in_upcall.req.io.count);