Remove a couple of mutex vars that were defined and used - but never initialized. No clear way to initialize them, and that area of the code should never see threads anyway.

This commit was SVN r19889.

orte/mca/rmaps/rank_file/rmaps_rank_file.c

@@ -50,7 +50,6 @@ static int orte_rmaps_rank_file_parse(const char *, int);
 static char *orte_rmaps_rank_file_parse_string_or_int(void);
 char *orte_rmaps_rank_file_path = NULL;
 static const char *orte_rmaps_rank_file_name_cur = NULL;
-static opal_mutex_t orte_rmaps_rank_file_mutex;
 char *orte_rmaps_rank_file_slot_list;
 
 /*
@@ -540,8 +539,6 @@ static int orte_rmaps_rank_file_parse(const char *rankfile, int np)
    char* value;
    int ival=-1;
 
-   OPAL_THREAD_LOCK(&orte_rmaps_rank_file_mutex);
-
    orte_rmaps_rank_file_name_cur = rankfile;
    orte_rmaps_rank_file_done = false;
    orte_rmaps_rank_file_in = fopen(rankfile, "r");
@@ -626,7 +623,6 @@ static int orte_rmaps_rank_file_parse(const char *rankfile, int np)
 
 unlock:
     orte_rmaps_rank_file_name_cur = NULL;
-    OPAL_THREAD_UNLOCK(&orte_rmaps_rank_file_mutex);
     return rc;
 }
 

orte/util/hostfile/hostfile.c

@@ -31,7 +31,6 @@
 #include "opal/util/argv.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/threads/mutex.h"
 #include "opal/util/if.h"
 #include "opal/util/os_path.h"
 #include "opal/util/path.h"
@@ -47,7 +46,6 @@
 #include "orte/util/hostfile/hostfile_lex.h"
 #include "orte/util/hostfile/hostfile.h"
 
-static opal_mutex_t hostfile_mutex;
 
 static const char *cur_hostfile_name = NULL;
 
@@ -327,7 +325,6 @@ static int hostfile_parse(const char *hostfile, opal_list_t* updates, opal_list_
     int token;
     int rc = ORTE_SUCCESS;
 
-    OPAL_THREAD_LOCK(&hostfile_mutex);
 
     cur_hostfile_name = hostfile;
     
@@ -385,7 +382,6 @@ static int hostfile_parse(const char *hostfile, opal_list_t* updates, opal_list_
 unlock:
     cur_hostfile_name = NULL;
 
-    OPAL_THREAD_UNLOCK(&hostfile_mutex);
     return rc;
 }