osd/PG: move C_PG_FinishRecovery into header

Less code than delcaring it in 2 places (by making it a friend).

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index a56de2ff8635654bdde36f49bf0ee11cc554d451..0c8556a456fdc00d947b10acdf8bff97642e19b0 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1988,14 +1988,6 @@ unsigned PG::get_scrub_priority()
   return pool_scrub_priority > 0 ? pool_scrub_priority : cct->_conf->osd_scrub_priority;
 }
 
-struct C_PG_FinishRecovery : public Context {
-  PGRef pg;
-  explicit C_PG_FinishRecovery(PG *p) : pg(p) {}
-  void finish(int r) override {
-    pg->_finish_recovery(this);
-  }
-};
-
 void PG::mark_clean()
 {
   if (actingset.size() == get_osdmap()->get_pg_size(info.pgid.pgid)) {

diff --git a/src/osd/PG.h b/src/osd/PG.h
index c223f3850d2ab12bf9e0aa3e11a53eba95677f44..966d0a42803c1a19a2f614cef2d76c7ae270e68b 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1187,9 +1187,14 @@ protected:
   Context *finish_sync_event;
 
   void finish_recovery(list<Context*>& tfin);
-public:
   void _finish_recovery(Context *c);
-protected:
+  struct C_PG_FinishRecovery : public Context {
+    PGRef pg;
+    explicit C_PG_FinishRecovery(PG *p) : pg(p) {}
+    void finish(int r) override {
+      pg->_finish_recovery(this);
+    }
+  };
   void cancel_recovery();
   void clear_recovery_state();
   virtual void _clear_recovery_state() = 0;