From 40762b8985b8e032cd45a9d3df652fa4657b0a6b Mon Sep 17 00:00:00 2001 From: Jesse Williamson Date: Wed, 19 Apr 2017 02:58:35 -0700 Subject: [PATCH] rbd_mirror: migrate std::atomic to std::atomic Signed-off-by: Jesse Williamson --- src/tools/rbd_mirror/Mirror.h | 2 +- src/tools/rbd_mirror/PoolReplayer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd_mirror/Mirror.h b/src/tools/rbd_mirror/Mirror.h index 88d15cfc8053..2253156d660c 100644 --- a/src/tools/rbd_mirror/Mirror.h +++ b/src/tools/rbd_mirror/Mirror.h @@ -67,7 +67,7 @@ private: std::shared_ptr m_image_deleter; ImageSyncThrottlerRef<> m_image_sync_throttler; std::map > m_pool_replayers; - atomic_t m_stopping; + std::atomic m_stopping = { false }; bool m_manual_stop = false; MirrorAdminSocketHook *m_asok_hook; }; diff --git a/src/tools/rbd_mirror/PoolReplayer.h b/src/tools/rbd_mirror/PoolReplayer.h index 55fdcedf3c38..87a6589356eb 100644 --- a/src/tools/rbd_mirror/PoolReplayer.h +++ b/src/tools/rbd_mirror/PoolReplayer.h @@ -105,7 +105,7 @@ private: ImageSyncThrottlerRef<> m_image_sync_throttler; mutable Mutex m_lock; Cond m_cond; - atomic_t m_stopping; + std::atomic m_stopping = { false }; bool m_manual_stop = false; bool m_blacklisted = false; -- 2.47.3