From: Kefu Chai <kchai@redhat.com>
Date: Mon, 3 Jun 2019 07:37:25 +0000 (+0800)
Subject: osd/ClassHandler: use ceph::mutex instead of Mutex
X-Git-Tag: v15.1.0~2536^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69611dcc54d06c0eab06984e8543207ae609cb89;p=ceph.git

osd/ClassHandler: use ceph::mutex instead of Mutex

for better performance

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/osd/ClassHandler.cc b/src/osd/ClassHandler.cc
index f7927f6ceda..b84308b1a0a 100644
--- a/src/osd/ClassHandler.cc
+++ b/src/osd/ClassHandler.cc
@@ -203,7 +203,7 @@ int ClassHandler::_load_class(ClassData *cls)
 
 ClassHandler::ClassData *ClassHandler::register_class(const char *cname)
 {
-  ceph_assert(mutex.is_locked());
+  ceph_assert(ceph_mutex_is_locked(mutex));
 
   ClassData *cls = _get_class(cname, false);
   ldout(cct, 10) << "register_class " << cname << " status " << cls->status << dendl;
diff --git a/src/osd/ClassHandler.h b/src/osd/ClassHandler.h
index 884801fe704..9b8580f02fa 100644
--- a/src/osd/ClassHandler.h
+++ b/src/osd/ClassHandler.h
@@ -4,8 +4,8 @@
 #define CEPH_CLASSHANDLER_H
 
 #include "include/types.h"
+#include "common/ceph_mutex.h"
 #include "objclass/objclass.h"
-#include "common/Mutex.h"
 
 //forward declaration
 class CephContext;
@@ -113,9 +113,9 @@ private:
       const std::string& list);
 
 public:
-  Mutex mutex;
+  ceph::mutex mutex = ceph::make_mutex("ClassHandler");
 
-  explicit ClassHandler(CephContext *cct_) : cct(cct_), mutex("ClassHandler") {}
+  explicit ClassHandler(CephContext *cct_) : cct(cct_) {}
 
   int open_all_classes();
   int open_class(const std::string& cname, ClassData **pcls);