]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd_mirror: migrate std::atomic<unsigned> to std::atomic<bool> 14656/head
authorJesse Williamson <jwilliamson@suse.de>
Wed, 19 Apr 2017 09:58:35 +0000 (02:58 -0700)
committerJesse Williamson <jwilliamson@suse.de>
Mon, 8 May 2017 14:14:04 +0000 (07:14 -0700)
Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
src/tools/rbd_mirror/Mirror.h
src/tools/rbd_mirror/PoolReplayer.h

index 88d15cfc8053071c624d29599dd3da888b67ba80..2253156d660cbb64fab79bab1ffcc0256f55c558 100644 (file)
@@ -67,7 +67,7 @@ private:
   std::shared_ptr<ImageDeleter> m_image_deleter;
   ImageSyncThrottlerRef<> m_image_sync_throttler;
   std::map<PoolPeer, std::unique_ptr<PoolReplayer> > m_pool_replayers;
-  atomic_t m_stopping;
+  std::atomic<bool> m_stopping = { false };
   bool m_manual_stop = false;
   MirrorAdminSocketHook *m_asok_hook;
 };
index 55fdcedf3c38cffb1225a07af8f6ede4036c091b..87a6589356eb116b45138ffc5b249c15f8626aef 100644 (file)
@@ -105,7 +105,7 @@ private:
   ImageSyncThrottlerRef<> m_image_sync_throttler;
   mutable Mutex m_lock;
   Cond m_cond;
-  atomic_t m_stopping;
+  std::atomic<bool> m_stopping = { false };
   bool m_manual_stop = false;
   bool m_blacklisted = false;