update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / librbd / journal / test_Entries.cc

diff --git a/ceph/src/test/librbd/journal/test_Entries.cc b/ceph/src/test/librbd/journal/test_Entries.cc
index 54be1487faed851a2472e30aa7566ab1b57e7e88..7b013e76ad0f05d2313d83348cab319d65792275 100644 (file)
--- a/ceph/src/test/librbd/journal/test_Entries.cc
+++ b/ceph/src/test/librbd/journal/test_Entries.cc
@@ -106,8 +106,8 @@ public:
                        librbd::journal::EventEntry *event_entry) {
     try {
       bufferlist data_bl = replay_entry.get_data();
-      bufferlist::iterator it = data_bl.begin();
-      ::decode(*event_entry, it);
+      auto it = data_bl.cbegin();
+      decode(*event_entry, it);
     } catch (const buffer::error &err) {
       return false;
     }
@@ -164,7 +164,7 @@ TEST_F(TestJournalEntries, AioDiscard) {
   REQUIRE_FEATURE(RBD_FEATURE_JOURNALING);
 
   CephContext* cct = reinterpret_cast<CephContext*>(_rados.cct());
-  REQUIRE(!cct->_conf->get_val<bool>("rbd_skip_partial_discard"));
+  REQUIRE(!cct->_conf.get_val<bool>("rbd_skip_partial_discard"));
 
   librbd::ImageCtx *ictx;
   ASSERT_EQ(0, open_image(m_image_name, &ictx));
@@ -175,7 +175,8 @@ TEST_F(TestJournalEntries, AioDiscard) {
   C_SaferCond cond_ctx;
   auto c = librbd::io::AioCompletion::create(&cond_ctx);
   c->get();
-  ictx->io_work_queue->aio_discard(c, 123, 234, ictx->skip_partial_discard);
+  ictx->io_work_queue->aio_discard(c, 123, 234,
+                                   ictx->discard_granularity_bytes);
   ASSERT_EQ(0, c->wait_for_complete());
   c->put();