From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Oct 2018 14:06:00 +0000 (-0500)
Subject: common/dns_resolver: Mutex -> ceph::mutex
X-Git-Tag: v14.1.0~820^2~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=755d0f4f0b87725816364188cc1a109cbd5dab3a;p=ceph.git

common/dns_resolver: Mutex -> ceph::mutex

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/dns_resolve.cc b/src/common/dns_resolve.cc
index 6b4a16db68f..eb223a6836c 100644
--- a/src/common/dns_resolve.cc
+++ b/src/common/dns_resolve.cc
@@ -86,7 +86,7 @@ int DNSResolver::get_state(CephContext *cct, res_state *ps)
 
 void DNSResolver::put_state(res_state s)
 {
-  std::lock_guard<Mutex> l(lock);
+  std::lock_guard l(lock);
   states.push_back(s);
 }
 #endif
@@ -122,7 +122,7 @@ int DNSResolver::resolve_cname(CephContext *cct, const string& hostname,
 #else
   {
 # ifndef HAVE_THREAD_SAFE_RES_QUERY
-    std::lock_guard<Mutex> l(lock);
+    std::lock_guard l(lock);
 # endif
     len = resolv_h->res_query(origname, ns_c_in, ns_t_cname, buf, sizeof(buf));
   }
@@ -219,7 +219,7 @@ int DNSResolver::resolve_ip_addr(CephContext *cct, res_state *res, const string&
 #else
   {
 # ifndef HAVE_THREAD_SAFE_RES_QUERY
-    std::lock_guard<Mutex> l(lock);
+    std::lock_guard l(lock);
 # endif
     len = resolv_h->res_query(hostname.c_str(), ns_c_in, type, nsbuf, sizeof(nsbuf));
   }
@@ -295,7 +295,7 @@ int DNSResolver::resolve_srv_hosts(CephContext *cct, const string& service_name,
 #else
   {
 # ifndef HAVE_THREAD_SAFE_RES_QUERY
-    std::lock_guard<Mutex> l(lock);
+    std::lock_guard l(lock);
 # endif
     len = resolv_h->res_search(query_str.c_str(), ns_c_in, ns_t_srv, nsbuf,
         sizeof(nsbuf));
diff --git a/src/common/dns_resolve.h b/src/common/dns_resolve.h
index e587224d84d..f5d94109c6e 100644
--- a/src/common/dns_resolve.h
+++ b/src/common/dns_resolve.h
@@ -17,7 +17,7 @@
 #include <netinet/in.h>
 #include <resolv.h>
 
-#include "common/Mutex.h"
+#include "common/ceph_mutex.h"
 #include "msg/msg_types.h"		// for entity_addr_t
 
 namespace ceph {
@@ -126,10 +126,10 @@ class DNSResolver {
         std::map<std::string, Record> *srv_hosts);
 
   private:
-    DNSResolver() : lock("DNSResolver") { resolv_h = new ResolvHWrapper(); }
+    DNSResolver() { resolv_h = new ResolvHWrapper(); }
     ~DNSResolver();
 
-    Mutex lock;
+    ceph::mutex lock = ceph::make_mutex("DNSResolver::lock");
     ResolvHWrapper *resolv_h;
 #ifdef HAVE_RES_NQUERY
     std::list<res_state> states;