From: Sage Weil <sage@redhat.com>
Date: Wed, 13 Sep 2017 22:12:33 +0000 (-0400)
Subject: osd/PG: move C_PG_ActivateCommitted into header
X-Git-Tag: v13.0.1~634^2~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=059158569c5210010badda46366bb2e965aaeb61;p=ceph.git

osd/PG: move C_PG_ActivateCommitted into header

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index fb18d50c5972..a56de2ff8635 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1507,17 +1507,6 @@ void PG::build_might_have_unfound()
   dout(15) << __func__ << ": built " << might_have_unfound << dendl;
 }
 
-struct C_PG_ActivateCommitted : public Context {
-  PGRef pg;
-  epoch_t epoch;
-  epoch_t activation_epoch;
-  C_PG_ActivateCommitted(PG *p, epoch_t e, epoch_t ae)
-    : pg(p), epoch(e), activation_epoch(ae) {}
-  void finish(int r) override {
-    pg->_activate_committed(epoch, activation_epoch);
-  }
-};
-
 void PG::activate(ObjectStore::Transaction& t,
 		  epoch_t activation_epoch,
 		  list<Context*>& tfin,
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 071a5ea02f71..c223f3850d2a 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1146,9 +1146,18 @@ protected:
     map<int,
       vector<pair<pg_notify_t, PastIntervals> > > *activator_map,
     RecoveryCtx *ctx);
-public:
+
+  struct C_PG_ActivateCommitted : public Context {
+    PGRef pg;
+    epoch_t epoch;
+    epoch_t activation_epoch;
+    C_PG_ActivateCommitted(PG *p, epoch_t e, epoch_t ae)
+      : pg(p), epoch(e), activation_epoch(ae) {}
+    void finish(int r) override {
+      pg->_activate_committed(epoch, activation_epoch);
+    }
+  };
   void _activate_committed(epoch_t epoch, epoch_t activation_epoch);
-protected:
   void all_activated_and_committed();
 
   void proc_primary_info(ObjectStore::Transaction &t, const pg_info_t &info);