From: Kefu Chai <kchai@redhat.com>
Date: Sat, 3 Oct 2020 10:19:04 +0000 (+0800)
Subject: crimson/osd: make OrderedPipelinePhase::mutex private
X-Git-Tag: v16.1.0~919^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8b35f00ccfe807d242af44ecb7d239f7d6f43d1;p=ceph.git

crimson/osd: make OrderedPipelinePhase::mutex private

as inner class has access to all outers class's members, even if they
are private.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/osd_operation.h b/src/crimson/osd/osd_operation.h
index ef975f7545f9..94a12dc75cdc 100644
--- a/src/crimson/osd/osd_operation.h
+++ b/src/crimson/osd/osd_operation.h
@@ -381,8 +381,6 @@ private:
  * the op ordering is preserved.
  */
 class OrderedPipelinePhase : public Blocker {
-  const char * name;
-
 protected:
   virtual void dump_detail(ceph::Formatter *f) const final;
   const char *get_type_name() const final {
@@ -390,8 +388,6 @@ protected:
   }
 
 public:
-  seastar::shared_mutex mutex;
-
   /**
    * Used to encapsulate pipeline residency state.
    */
@@ -423,6 +419,10 @@ public:
   };
 
   OrderedPipelinePhase(const char *name) : name(name) {}
+
+private:
+  const char * name;
+  seastar::shared_mutex mutex;
 };
 
 }