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

[CVS commit program]

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

Modified Files:
	pvfs2-client-core.c 
Log Message:
apply umount fix to perf counter path


Index: pvfs2-client-core.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/apps/kernel/linux/pvfs2-client-core.c,v
diff -p -u -r1.95 -r1.96
--- pvfs2-client-core.c	13 May 2008 13:46:28 -0000	1.95
+++ pvfs2-client-core.c	13 May 2008 14:04:01 -0000	1.96
@@ -1188,7 +1188,6 @@ fail_downcall:
 static PVFS_error service_perf_count_request(vfs_request_t *vfs_request)
 {
     char* tmp_str;
-    PVFS_error ret = -PVFS_EINVAL;
 
     gossip_debug(
         GOSSIP_CLIENTCORE_DEBUG, "Got a perf count request of type %d\n",
@@ -1249,12 +1248,11 @@ static PVFS_error service_perf_count_req
         default:
             /* unsupported request, didn't match anything in case statement */
             vfs_request->out_downcall.status = -PVFS_ENOSYS;
-            write_inlined_device_response(vfs_request);
-            return 0;
             break;
     }
 
-    write_inlined_device_response(vfs_request);
+    /* let handle_unexp_vfs_request() function detect completion and handle */
+    vfs_request->op_id = -1;
     return 0;
 }
 
@@ -2669,6 +2667,7 @@ static inline void package_downcall_memb
             break;
         }
         case PVFS2_VFS_OP_FS_UMOUNT:
+        case PVFS2_VFS_OP_PERF_COUNT:
             break;
         default:
             gossip_err("Completed upcall of unknown type %x!\n",
@@ -2863,6 +2862,7 @@ static inline PVFS_error handle_unexp_vf
             ret = service_fs_umount_request(vfs_request);
             break;
         case PVFS2_VFS_OP_PERF_COUNT:
+            posted_op = 1;
             ret = service_perf_count_request(vfs_request);
             break;
         case PVFS2_VFS_OP_PARAM: