osdc:replace ceph:atomic_t with std::atomic & changes affected by osd…

…c_atomic_replacement. same work as ceph#9138 Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
cxwshawn · May 23, 2016 · 37fe326 · 37fe326
1 parent 91e3fd6
commit 37fe326
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 106 deletions.
diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
@@ -331,7 +331,7 @@ void librados::RadosClient::shutdown()
   }
 
   bool need_objecter = false;
-  if (objecter && objecter->initialized.read()) {
+  if (objecter && objecter->initialized) {
     need_objecter = true;
   }
 

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
@@ -1079,7 +1079,7 @@ void MDSDaemon::suicide()
     mds_rank->shutdown();
   } else {
 
-    if (objecter->initialized.read()) {
+    if (objecter->initialized) {
       objecter->shutdown();
     }
     timer.shutdown();

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
@@ -227,7 +227,7 @@ void MDSRankDispatcher::shutdown()
   // shut down cache
   mdcache->shutdown();
 
-  if (objecter->initialized.read())
+  if (objecter->initialized)
     objecter->shutdown();
 
   monc->shutdown();