Index: src/apps/kernel/linux/pvfs2-client-core.c
===================================================================
RCS file: /anoncvs/pvfs2/src/apps/kernel/linux/pvfs2-client-core.c,v
retrieving revision 1.79
diff -u -r1.79 pvfs2-client-core.c
--- src/apps/kernel/linux/pvfs2-client-core.c	5 Dec 2006 23:21:06 -0000	1.79
+++ src/apps/kernel/linux/pvfs2-client-core.c	4 Jan 2007 18:39:37 -0000
@@ -1414,7 +1414,7 @@
 
     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);
@@ -1561,7 +1561,7 @@
 
     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 = 
@@ -1637,7 +1637,7 @@
 
     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);
@@ -2371,7 +2371,7 @@
                     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);