From: Kefu Chai <kchai@redhat.com>
Date: Sat, 6 Feb 2016 16:26:59 +0000 (+0800)
Subject: librbd: replace atomic_t with std::atomic<int>
X-Git-Tag: v10.1.0~420^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c3f8219362128dc1b4c5eddda12dd9cdd71cb44;p=ceph.git

librbd: replace atomic_t with std::atomic<int>

it fails to compile with clang, and turns out it should be
`ceph::atomic_t`, but I take this chance to replace it
with std::atomic<> to phase out atomic_t.

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

diff --git a/src/librbd/Operations.cc b/src/librbd/Operations.cc
index 719baf5c19f6..ed75c0b85dfa 100644
--- a/src/librbd/Operations.cc
+++ b/src/librbd/Operations.cc
@@ -52,7 +52,7 @@ int Operations<I>::flatten(ProgressContext &prog_ctx) {
     }
   }
 
-  uint64_t request_id = m_async_request_seq.inc();
+  uint64_t request_id = ++m_async_request_seq;
   r = invoke_async_request("flatten", false,
                            boost::bind(&Operations<I>::flatten, this,
                                        boost::ref(prog_ctx), _1),
@@ -129,7 +129,7 @@ int Operations<I>::rebuild_object_map(ProgressContext &prog_ctx) {
     return r;
   }
 
-  uint64_t request_id = m_async_request_seq.inc();
+  uint64_t request_id = ++m_async_request_seq;
   r = invoke_async_request("rebuild object map", true,
                            boost::bind(&Operations<I>::rebuild_object_map, this,
                                        boost::ref(prog_ctx), _1),
@@ -245,7 +245,7 @@ int Operations<I>::resize(uint64_t size, ProgressContext& prog_ctx) {
     return r;
   }
 
-  uint64_t request_id = m_async_request_seq.inc();
+  uint64_t request_id = ++m_async_request_seq;
   r = invoke_async_request("resize", false,
                            boost::bind(&Operations<I>::resize, this,
                                        size, boost::ref(prog_ctx), _1, 0),
diff --git a/src/librbd/Operations.h b/src/librbd/Operations.h
index 70eefde4959c..48fde18899a2 100644
--- a/src/librbd/Operations.h
+++ b/src/librbd/Operations.h
@@ -5,7 +5,7 @@
 #define CEPH_LIBRBD_OPERATIONS_H
 
 #include "include/int_types.h"
-#include "include/atomic.h"
+#include <atomic>
 #include <string>
 #include <boost/function.hpp>
 
@@ -59,7 +59,7 @@ public:
 
 private:
   ImageCtxT &m_image_ctx;
-  atomic_t m_async_request_seq;
+  std::atomic<int> m_async_request_seq;
 
   int invoke_async_request(const std::string& request_type,
                            bool permit_snapshot,