]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: make OrderedPipelinePhase::mutex private
authorKefu Chai <kchai@redhat.com>
Sat, 3 Oct 2020 10:19:04 +0000 (18:19 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 3 Oct 2020 11:07:46 +0000 (19:07 +0800)
as inner class has access to all outers class's members, even if they
are private.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/osd_operation.h

index ef975f7545f9d385dbc7774ff350cc8ba23ca651..94a12dc75cdcd6c099062e55d2fd3456133deaaa 100644 (file)
@@ -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;
 };
 
 }