mon/PGMonitor: link PGStatService to the actual PGMap

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

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 15e22daebe857d1ce70f2c2b5d1ef1f27b10584a..c7b3e2258da2a27b18f51f65433db0866dcd8d34 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1671,19 +1671,13 @@ bool PGMonitor::check_sub(Subscription *sub)
   }
   return true;
 }
-class PGMapStatService : public PGMap, public PGStatService {
-  PGMap& parent;
+class PGMapStatService : public PGStatService {
+  const PGMap& parent;
   PGMonitor *pgmon;
 public:
-  PGMapStatService() : PGMap(), PGStatService(),
-                      parent(*static_cast<PGMap*>(this)), pgmon(nullptr) {}
-  PGMapStatService(const PGMap& o,
-                  PGMonitor *pgm) : PGMap(o), PGStatService(),
-                                    parent(*static_cast<PGMap*>(this)),
-                                    pgmon(pgm) {}
-  void reset(const PGMap& o) {
-    parent = o;
-  }
+  PGMapStatService(const PGMap& o, PGMonitor *pgm)
+    : parent(o),
+      pgmon(pgm) {}
 
   bool is_readable() const { return pgmon->is_readable(); }