[Pvfs2-cvs] commit by pcarns in pvfs2/src/client/sysint: client-state-machine.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv7348/src/client/sysint

Modified Files:
      Tag: small-file-branch
	client-state-machine.c 
Log Message:
merging misc. state machine related updates from trunk


Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.93.2.2 -r1.93.2.3
--- client-state-machine.c	28 Jan 2008 21:16:19 -0000	1.93.2.2
+++ client-state-machine.c	29 Feb 2008 20:12:17 -0000	1.93.2.3
@@ -301,7 +301,8 @@ int client_state_machine_terminate(
 
     if (!((PINT_smcb_op(smcb) == PVFS_SYS_IO) &&
             (PINT_smcb_cancelled(smcb)) &&
-            (cancelled_io_jobs_are_pending(smcb))))
+            (cancelled_io_jobs_are_pending(smcb))) &&
+        !PINT_smcb_immediate_completion(smcb))
     {
         gossip_debug(GOSSIP_CLIENT_DEBUG, 
                 "add smcb %p to completion list\n", smcb);