[Pvfs2-cvs] commit by nlmills in pvfs2/src/io/buffer: ncac-trove.c

[CVS commit program]

Update of /anoncvs/pvfs2/src/io/buffer
In directory parlweb1:/tmp/cvs-serv5511/src/io/buffer

Modified Files:
      Tag: cu-security-branch
	ncac-trove.c 
Log Message:
merged in changes from summer at LANL


Index: ncac-trove.c
===================================================================
RCS file: /anoncvs/pvfs2/src/io/buffer/ncac-trove.c,v
diff -p -u -r1.7 -r1.7.36.1
--- ncac-trove.c	27 May 2006 23:50:03 -0000	1.7
+++ ncac-trove.c	25 Aug 2009 17:56:12 -0000	1.7.36.1
@@ -117,7 +117,7 @@ int NCAC_aio_read_ext( PVFS_fs_id coll_i
                                   NULL, /* vtag */
                                   user_ptr_array,
                                   context,
-                                  &op_id);
+                                  &op_id, NULL);
 
     if (ret < 0) {
         NCAC_error("trove listio read failed\n");
@@ -212,7 +212,7 @@ int NCAC_aio_write( PVFS_fs_id coll_id, 
                                   NULL, /* vtag */
                                   user_ptr_array,
                                   context,
-                                  &op_id);
+                                  &op_id, NULL);
 
     if (ret < 0) {
         NCAC_error("trove listio read failed\n");
@@ -247,7 +247,7 @@ int do_read_for_rmw(PVFS_fs_id coll_id, 
     ret = trove_bstream_read_at(coll_id, handle,
                                 buf, &inout_size,
                                 0, 0, NULL, NULL,
-                                context, &op_id);
+                                context, &op_id, NULL);
 
     DPRINT("do_read_for_rmw; req=%lld\n", op_id);
 
@@ -392,7 +392,7 @@ int init_io_read( PVFS_fs_id coll_id, PV
                                   NULL, /* vtag */
                                   user_ptr_array,
                                   context,
-                                  ioreq);
+                                  ioreq, NULL);
 
     if (ret < 0) {
         NCAC_error("trove read at failed\n");