[PVFS2-CVS] commit by neill in pvfs2/src/apps/kernel/linux: pvfs2-client-core.c

[CVS commit program]

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

Modified Files:
	pvfs2-client-core.c 
Log Message:
- fix a bug in sys-io I introduced earlier (server_ct)
- some cleanups
- put some acache hooks back in place to try to get it working at some point


Index: pvfs2-client-core.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client-core.c,v
diff -p -u -r1.6 -r1.7
--- pvfs2-client-core.c	12 Jul 2004 21:12:39 -0000	1.6
+++ pvfs2-client-core.c	13 Jul 2004 20:44:42 -0000	1.7
@@ -229,10 +229,8 @@ static int cancel_op_in_progress(PVFS_id
             hash_link, vfs_request_t, hash_link);
         assert(vfs_request);
         assert(vfs_request->info.tag == tag);
-        /*
-          for now, cancellation is ONLY support on I/O operations,
-          so assert that this is an I/O operation
-        */
+
+        /* for now, cancellation is ONLY supported on I/O operations */
         assert(vfs_request->in_upcall.type == PVFS2_VFS_OP_FILE_IO);
 
         gossip_debug(GOSSIP_CLIENT_DEBUG, "cancelling I/O req %p "
@@ -1313,8 +1311,6 @@ static inline void package_downcall_memb
                         (size_t)vfs_request->response.io.total_completed;
                 }
 #else
-                assert(vfs_request->io_tmp_buf == NULL);
-
                 PVFS_Request_free(&vfs_request->mem_req);
                 PVFS_Request_free(&vfs_request->file_req);