update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / librbd / mirror / test_mock_DisableRequest.cc

diff --git a/ceph/src/test/librbd/mirror/test_mock_DisableRequest.cc b/ceph/src/test/librbd/mirror/test_mock_DisableRequest.cc
index c0b4fe291af24a4c47675f9b0f5937a9cf85e977..5af4e1c5a99f1350ca7e7c5baf6cbe4ea256dcf5 100644 (file)
--- a/ceph/src/test/librbd/mirror/test_mock_DisableRequest.cc
+++ b/ceph/src/test/librbd/mirror/test_mock_DisableRequest.cc
@@ -17,7 +17,7 @@ namespace librbd {
 namespace {
 
 struct MockTestImageCtx : public MockImageCtx {
-  MockTestImageCtx(librbd::ImageCtx& image_ctx) : MockImageCtx(image_ctx) {
+  explicit MockTestImageCtx(librbd::ImageCtx& image_ctx) : MockImageCtx(image_ctx) {
   }
 };
 
@@ -28,7 +28,7 @@ struct Journal<librbd::MockTestImageCtx> {
   static Journal *s_instance;
   static void is_tag_owner(librbd::MockTestImageCtx *, bool *is_primary,
                            Context *on_finish) {
-    assert(s_instance != nullptr);
+    ceph_assert(s_instance != nullptr);
     s_instance->is_tag_owner(is_primary, on_finish);
   }
 
@@ -49,7 +49,7 @@ struct MirroringWatcher<librbd::MockTestImageCtx> {
                                    const std::string &image_id,
                                    const std::string &global_image_id,
                                    Context *on_finish) {
-    assert(s_instance != nullptr);
+    ceph_assert(s_instance != nullptr);
     s_instance->notify_image_updated(mirror_image_state, image_id,
                                      global_image_id, on_finish);
   }
@@ -74,7 +74,7 @@ struct PromoteRequest<librbd::MockTestImageCtx> {
   static PromoteRequest *s_instance;
   static PromoteRequest *create(librbd::MockTestImageCtx *, bool force,
                                 Context *on_finish) {
-    assert(s_instance != nullptr);
+    ceph_assert(s_instance != nullptr);
     s_instance->on_finish = on_finish;
     return s_instance;
   }
@@ -117,8 +117,9 @@ public:
   void expect_get_mirror_image(MockTestImageCtx &mock_image_ctx,
                                const cls::rbd::MirrorImage &mirror_image,
                                int r) {
+    using ceph::encode;
     bufferlist bl;
-    ::encode(mirror_image, bl);
+    encode(mirror_image, bl);
 
     EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx),
                 exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_image_get"),
@@ -162,7 +163,8 @@ public:
                                   const std::set<cls::journal::Client> &clients,
                                   int r) {
     bufferlist bl;
-    ::encode(clients, bl);
+    using ceph::encode;
+    encode(clients, bl);
 
     EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx),
                 exec(::journal::Journaler::header_oid(mock_image_ctx.id),
@@ -175,7 +177,8 @@ public:
                                         const std::string &client_id,
                                         int r) {
     bufferlist bl;
-    ::encode(client_id, bl);
+    using ceph::encode;
+    encode(client_id, bl);
 
     EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx),
                 exec(::journal::Journaler::header_oid(mock_image_ctx.id),
@@ -198,8 +201,9 @@ public:
 
   template <typename T>
   bufferlist encode(const T &t) {
+    using ceph::encode;
     bufferlist bl;
-    ::encode(t, bl);
+    encode(t, bl);
     return bl;
   }