From: shangdehao1 <dehao.shang@intel.com>
Date: Wed, 8 May 2019 05:10:23 +0000 (+0800)
Subject: librbd: change RO hook naming.
X-Git-Tag: v15.1.0~2379^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f07bff52c82e1fbab09d47cb3e7125a69c02bf78;p=ceph.git

librbd: change RO hook naming.

change SharedReadOnlyCache to ParentCache

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 304f513f721..5c631b0fac9 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7148,7 +7148,7 @@ static std::vector<Option> get_rbd_options() {
     .set_default(false)
     .set_description("whether to block writes to the cache before the aio_write call completes"),
 
-    Option("rbd_shared_cache_enabled", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    Option("rbd_parent_cache_enabled", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)
     .set_description("whether to enable rbd shared ro cache"),
 
diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index 4830aa4c82a..2772c836e2b 100644
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -769,7 +769,7 @@ public:
     ASSIGN_OPTION(skip_partial_discard, bool);
     ASSIGN_OPTION(discard_granularity_bytes, uint64_t);
     ASSIGN_OPTION(blkin_trace_all, bool);
-    ASSIGN_OPTION(shared_cache_enabled, bool);
+    ASSIGN_OPTION(parent_cache_enabled, bool);
 
 #undef ASSIGN_OPTION
 
diff --git a/src/librbd/ImageCtx.h b/src/librbd/ImageCtx.h
index f0ae7a1c140..7864e9a157c 100644
--- a/src/librbd/ImageCtx.h
+++ b/src/librbd/ImageCtx.h
@@ -195,7 +195,7 @@ namespace librbd {
     uint64_t mtime_update_interval;
     uint64_t atime_update_interval;
 
-    bool shared_cache_enabled;
+    bool parent_cache_enabled;
     std::string shared_cache_path;
 
     LibrbdAdminSocketHook *asok_hook;
diff --git a/src/librbd/image/OpenRequest.cc b/src/librbd/image/OpenRequest.cc
index c50145587e9..f4cf7a7bf63 100644
--- a/src/librbd/image/OpenRequest.cc
+++ b/src/librbd/image/OpenRequest.cc
@@ -523,7 +523,7 @@ Context *OpenRequest<I>::send_init_cache(int *result) {
 
   if (!m_image_ctx->cache || m_image_ctx->child != nullptr) {
      // enable Shared Read-only cache for parent image
-    if (m_image_ctx->child != nullptr && m_image_ctx->shared_cache_enabled ) {
+    if (m_image_ctx->child != nullptr && m_image_ctx->parent_cache_enabled ) {
       ldout(cct, 10) << this << " " << "setting up parent cache"<< dendl;
       auto sro_cache = cache::SharedReadOnlyObjectDispatch<I>::create(m_image_ctx);
       sro_cache->init();