update sources to v12.2.1

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

diff --git a/ceph/src/test/librbd/journal/test_Replay.cc b/ceph/src/test/librbd/journal/test_Replay.cc
index 7c735695b8e89fae73fbcbbeaf5ac3e555318e73..d8c651858a822f9d58999825fcf14858ad1242c9 100644 (file)
--- a/ceph/src/test/librbd/journal/test_Replay.cc
+++ b/ceph/src/test/librbd/journal/test_Replay.cc
@@ -143,7 +143,8 @@ TEST_F(TestJournalReplay, AioDiscardEvent) {
 
   // inject a discard operation into the journal
   inject_into_journal(ictx,
-                      librbd::journal::AioDiscardEvent(0, payload.size(), ictx->skip_partial_discard));
+                      librbd::journal::AioDiscardEvent(0, payload.size(),
+                                                       ictx->skip_partial_discard));
   close_image(ictx);
 
   // re-open the journal so that it replays the new entry
@@ -155,7 +156,7 @@ TEST_F(TestJournalReplay, AioDiscardEvent) {
                                 librbd::io::ReadResult{read_result}, 0);
   ASSERT_EQ(0, aio_comp->wait_for_complete());
   aio_comp->release();
-  if (ictx->cct->_conf->rbd_skip_partial_discard) {
+  if (ictx->skip_partial_discard) {
     ASSERT_EQ(payload, read_payload);
   } else {
     ASSERT_EQ(std::string(read_payload.size(), '\0'), read_payload);
@@ -170,9 +171,11 @@ TEST_F(TestJournalReplay, AioDiscardEvent) {
 
   // replay several envents and check the commit position
   inject_into_journal(ictx,
-                      librbd::journal::AioDiscardEvent(0, payload.size(), ictx->cct->_conf->rbd_skip_partial_discard));
+                      librbd::journal::AioDiscardEvent(0, payload.size(),
+                                                       ictx->skip_partial_discard));
   inject_into_journal(ictx,
-                      librbd::journal::AioDiscardEvent(0, payload.size(), ictx->cct->_conf->rbd_skip_partial_discard));
+                      librbd::journal::AioDiscardEvent(0, payload.size(),
+                                                       ictx->skip_partial_discard));
   close_image(ictx);
 
   ASSERT_EQ(0, open_image(m_image_name, &ictx));
@@ -183,7 +186,8 @@ TEST_F(TestJournalReplay, AioDiscardEvent) {
 
   // verify lock ordering constraints
   aio_comp = new librbd::io::AioCompletion();
-  ictx->io_work_queue->aio_discard(aio_comp, 0, read_payload.size(), ictx->cct->_conf->rbd_skip_partial_discard);
+  ictx->io_work_queue->aio_discard(aio_comp, 0, read_payload.size(),
+                                   ictx->skip_partial_discard);
   ASSERT_EQ(0, aio_comp->wait_for_complete());
   aio_comp->release();
 }