From 2059bbfff03ebf4d3a8678dab655bbbeefed6b93 Mon Sep 17 00:00:00 2001
From: lixiaoy1 <xiaoyan.li@intel.com>
Date: Tue, 20 Oct 2020 11:32:21 -0400
Subject: [PATCH] librbd/io: Use io_image_dispatch->invalidate_cache

Signed-off-by: Li, Xiaoyan <xiaoyan.li@intel.com>
---
 src/librbd/exclusive_lock/PreReleaseRequest.cc               | 3 +--
 src/librbd/operation/ResizeRequest.cc                        | 3 +--
 src/librbd/operation/SnapshotRollbackRequest.cc              | 5 ++---
 .../librbd/exclusive_lock/test_mock_PreReleaseRequest.cc     | 2 +-
 src/test/librbd/operation/test_mock_ResizeRequest.cc         | 2 +-
 .../librbd/operation/test_mock_SnapshotRollbackRequest.cc    | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/librbd/exclusive_lock/PreReleaseRequest.cc b/src/librbd/exclusive_lock/PreReleaseRequest.cc
index 679b4bd0af2..5d926c9059c 100644
--- a/src/librbd/exclusive_lock/PreReleaseRequest.cc
+++ b/src/librbd/exclusive_lock/PreReleaseRequest.cc
@@ -198,11 +198,10 @@ void PreReleaseRequest<I>::send_invalidate_cache() {
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 10) << dendl;
 
-  std::shared_lock owner_lock{m_image_ctx.owner_lock};
   Context *ctx = create_context_callback<
       PreReleaseRequest<I>,
       &PreReleaseRequest<I>::handle_invalidate_cache>(this);
-  m_image_ctx.io_object_dispatcher->invalidate_cache(ctx);
+  m_image_ctx.io_image_dispatcher->invalidate_cache(ctx);
 }
 
 template <typename I>
diff --git a/src/librbd/operation/ResizeRequest.cc b/src/librbd/operation/ResizeRequest.cc
index 57c9a6259d4..e4e76dacd82 100644
--- a/src/librbd/operation/ResizeRequest.cc
+++ b/src/librbd/operation/ResizeRequest.cc
@@ -225,8 +225,7 @@ void ResizeRequest<I>::send_invalidate_cache() {
 
   // need to invalidate since we're deleting objects, and
   // ObjectCacher doesn't track non-existent objects
-  std::shared_lock owner_locker{image_ctx.owner_lock};
-  image_ctx.io_object_dispatcher->invalidate_cache(create_context_callback<
+  image_ctx.io_image_dispatcher->invalidate_cache(create_context_callback<
     ResizeRequest<I>, &ResizeRequest<I>::handle_invalidate_cache>(this));
 }
 
diff --git a/src/librbd/operation/SnapshotRollbackRequest.cc b/src/librbd/operation/SnapshotRollbackRequest.cc
index 87c155c6355..87c5212deac 100644
--- a/src/librbd/operation/SnapshotRollbackRequest.cc
+++ b/src/librbd/operation/SnapshotRollbackRequest.cc
@@ -379,18 +379,17 @@ Context *SnapshotRollbackRequest<I>::send_invalidate_cache() {
   CephContext *cct = image_ctx.cct;
   ldout(cct, 5) << this << " " << __func__ << dendl;
 
-  std::shared_lock owner_lock{image_ctx.owner_lock};
   if(m_object_map != nullptr) {
     Context *ctx = create_context_callback<
       SnapshotRollbackRequest<I>,
       &SnapshotRollbackRequest<I>::handle_invalidate_cache>(this, m_object_map);
-    image_ctx.io_object_dispatcher->invalidate_cache(ctx);
+    image_ctx.io_image_dispatcher->invalidate_cache(ctx);
   }
   else {
     Context *ctx = create_context_callback<
       SnapshotRollbackRequest<I>,
       &SnapshotRollbackRequest<I>::handle_invalidate_cache>(this);
-    image_ctx.io_object_dispatcher->invalidate_cache(ctx);
+    image_ctx.io_image_dispatcher->invalidate_cache(ctx);
   }
   return nullptr;
 }
diff --git a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc
index 6a55c87d217..a3f2e14e10e 100644
--- a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc
+++ b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc
@@ -144,7 +144,7 @@ public:
 
   void expect_invalidate_cache(MockTestImageCtx &mock_image_ctx,
                                int r) {
-    EXPECT_CALL(*mock_image_ctx.io_object_dispatcher, invalidate_cache(_))
+    EXPECT_CALL(*mock_image_ctx.io_image_dispatcher, invalidate_cache(_))
       .WillOnce(CompleteContext(r, mock_image_ctx.image_ctx->op_work_queue));
   }
 
diff --git a/src/test/librbd/operation/test_mock_ResizeRequest.cc b/src/test/librbd/operation/test_mock_ResizeRequest.cc
index 5464ce1a5f6..552ba5c9756 100644
--- a/src/test/librbd/operation/test_mock_ResizeRequest.cc
+++ b/src/test/librbd/operation/test_mock_ResizeRequest.cc
@@ -146,7 +146,7 @@ public:
 
   void expect_invalidate_cache(MockImageCtx &mock_image_ctx,
                                int r) {
-    EXPECT_CALL(*mock_image_ctx.io_object_dispatcher, invalidate_cache(_))
+    EXPECT_CALL(*mock_image_ctx.io_image_dispatcher, invalidate_cache(_))
                    .WillOnce(CompleteContext(r, mock_image_ctx.image_ctx->op_work_queue));
     expect_op_work_queue(mock_image_ctx);
   }
diff --git a/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc b/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc
index 85522543f12..65eac7a6d6c 100644
--- a/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc
+++ b/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc
@@ -187,7 +187,7 @@ public:
 
   void expect_invalidate_cache(MockOperationImageCtx &mock_image_ctx,
                                int r) {
-    EXPECT_CALL(*mock_image_ctx.io_object_dispatcher, invalidate_cache(_))
+    EXPECT_CALL(*mock_image_ctx.io_image_dispatcher, invalidate_cache(_))
                    .WillOnce(CompleteContext(r, mock_image_ctx.image_ctx->op_work_queue));
   }
 
-- 
2.47.3