[Pvfs2-cvs] commit by kunkel in pvfs2/src/io/job: thread-mgr.c job.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/job
In directory parlweb1:/tmp/cvs-serv18213/src/io/job

Modified Files:
      Tag: kunkel-hint-branch
	thread-mgr.c job.c 
Log Message:
Upgrade to current CVS version


Index: thread-mgr.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/job/thread-mgr.c,v
diff -p -u -r1.31.2.1 -r1.31.2.2
--- thread-mgr.c	25 Sep 2006 12:40:11 -0000	1.31.2.1
+++ thread-mgr.c	2 Dec 2006 11:20:38 -0000	1.31.2.2
@@ -405,13 +405,10 @@ int PINT_thread_mgr_trove_start(void)
 	gen_mutex_unlock(&trove_mutex);
 	return(ret);
     }
-#else
-    ret = 0;
-    assert(0);
-#endif
-
-    trove_thread_running = 1;
 #ifdef __PVFS2_JOB_THREADED__
+    trove_thread_running = 1;
+    trove_thread_ref_count++;
+
     ret = pthread_create(&trove_thread_id, NULL, trove_thread_function, NULL);
     if(ret != 0)
     {
@@ -421,8 +418,11 @@ int PINT_thread_mgr_trove_start(void)
 	/* TODO: convert error code */
 	return(-ret);
     }
-#endif
-    trove_thread_ref_count++;
+#endif /* PVFS2_JOB_THREADED */
+#else
+    ret = 0;
+    assert(0);
+#endif /* PVFS2_TROVE_SUPPORT */
 
     gen_mutex_unlock(&trove_mutex);
     return(0);

Index: job.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/job/job.c,v
diff -p -u -r1.169.6.5 -r1.169.6.6
--- job.c	27 Sep 2006 09:35:05 -0000	1.169.6.5
+++ job.c	2 Dec 2006 11:20:38 -0000	1.169.6.6
@@ -3445,7 +3445,9 @@ int job_trove_fs_lookup(char *collname,
     user_ptr_internal = &jd->trove_callback;
 
 #ifdef __PVFS2_TROVE_SUPPORT__
-    ret = trove_collection_lookup(collname, &(jd->u.trove.fsid), 
+    ret = trove_collection_lookup(
+        TROVE_METHOD_DBPF,
+        collname, &(jd->u.trove.fsid), 
         user_ptr_internal, &(jd->u.trove.id));
 #else
     gossip_err("Error: Trove support not enabled.\n");