Index: s240p2/slurm/src/common/slurm_jobacct_gather.c
===================================================================
RCS file: /cvsroot/slurm/slurm/src/common/slurm_jobacct_gather.c,v
retrieving revision 1.1.1.13
diff -u -r1.1.1.13 slurm_jobacct_gather.c
--- s240p2/slurm/src/common/slurm_jobacct_gather.c	29 Aug 2011 16:32:39 -0000	1.1.1.13
+++ s240p2/slurm/src/common/slurm_jobacct_gather.c	16 Dec 2011 21:13:30 -0000
@@ -314,12 +314,10 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return jobacct;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		jobacct = (*(g_jobacct_gather_context->
 			     ops.jobacct_gather_create))(jobacct_id);
 
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return jobacct;
 }
 
@@ -328,11 +326,9 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		(*(g_jobacct_gather_context->ops.jobacct_gather_destroy))
 			(jobacct);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return;
 }
 
@@ -390,12 +386,10 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return SLURM_ERROR;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		retval = (*(g_jobacct_gather_context->
 			    ops.jobacct_gather_unpack))
 			(jobacct, rpc_version, buffer);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return retval;
 }
 
@@ -405,11 +399,9 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		(*(g_jobacct_gather_context->ops.jobacct_gather_aggregate))
 			(dest, from);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return;
 }
 
@@ -419,12 +411,10 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return SLURM_ERROR;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		retval = (*(g_jobacct_gather_context->ops.jobacct_gather_startpoll))
 			(frequency);
 
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return retval;
 }
 
@@ -434,10 +424,8 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return SLURM_ERROR;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		retval = (*(g_jobacct_gather_context->ops.jobacct_gather_endpoll))();
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return retval;
 }
 
@@ -446,12 +434,10 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		(*(g_jobacct_gather_context->ops.jobacct_gather_change_poll))
 			(frequency);
-
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+	return;
 }
 
 extern void jobacct_gather_g_suspend_poll()
@@ -459,10 +445,8 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		(*(g_jobacct_gather_context->ops.jobacct_gather_suspend_poll))();
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return;
 }
 
@@ -471,10 +455,8 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		(*(g_jobacct_gather_context->ops.jobacct_gather_resume_poll))();
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return;
 }
 
@@ -484,13 +466,10 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return SLURM_ERROR;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		retval = (*(g_jobacct_gather_context->ops.
 			    jobacct_gather_set_proctrack_container_id))(id);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return retval;
-
 }
 
 extern int jobacct_gather_g_add_task(pid_t pid, jobacct_id_t *jobacct_id)
@@ -499,11 +478,9 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return SLURM_ERROR;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		retval = (*(g_jobacct_gather_context->
 			    ops.jobacct_gather_add_task))(pid, jobacct_id);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return retval;
 }
 
@@ -513,11 +490,9 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return jobacct;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		jobacct = (*(g_jobacct_gather_context->
 			     ops.jobacct_gather_stat_task))(pid);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return jobacct;
 }
 
@@ -527,11 +502,9 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return jobacct;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		jobacct = (*(g_jobacct_gather_context->
 			     ops.jobacct_gather_remove_task))(pid);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return jobacct;
 }
 
@@ -541,10 +514,8 @@
 	if (_slurm_jobacct_gather_init() < 0)
 		return;
 
-	slurm_mutex_lock( &g_jobacct_gather_context_lock );
 	if ( g_jobacct_gather_context )
 		(*(g_jobacct_gather_context->ops.jobacct_gather_2_stats))
 			(stats, jobacct);
-	slurm_mutex_unlock( &g_jobacct_gather_context_lock );
 	return;
 }