From 40a92a1f56661a9de1cad521540fbe6a7ac924a6 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 23 Feb 2018 09:17:12 -0600
Subject: [PATCH] osd/PG: move shutdown into PG

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/osd/PG.cc           | 7 +++++++
 src/osd/PG.h            | 3 ++-
 src/osd/PrimaryLogPG.cc | 7 -------
 src/osd/PrimaryLogPG.h  | 3 +--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 9759312bf51..9be1907173f 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3298,6 +3298,13 @@ void PG::init(
   write_if_dirty(*t);
 }
 
+void PG::shutdown()
+{
+  lock();
+  on_shutdown();
+  unlock();
+}
+
 #pragma GCC diagnostic ignored "-Wpragmas"
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/src/osd/PG.h b/src/osd/PG.h
index c15d4be0961..947c3b14b77 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -446,7 +446,8 @@ public:
   void get_pg_stats(std::function<void(const pg_stat_t&, epoch_t lec)> f);
   void with_heartbeat_peers(std::function<void(int)> f);
 
-  virtual void shutdown() = 0;
+  void shutdown();
+  virtual void on_shutdown() = 0;
 
   bool get_must_scrub() const {
     return scrubber.must_scrub;
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index adda62bb47e..e45d33f7bc0 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -11676,13 +11676,6 @@ void PrimaryLogPG::clear_async_reads()
   }
 }
 
-void PrimaryLogPG::shutdown()
-{
-  lock();
-  on_shutdown();
-  unlock();
-}
-
 void PrimaryLogPG::on_shutdown()
 {
   dout(10) << __func__ << dendl;
diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
index c71472106df..37f44fa8574 100644
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@ -1824,8 +1824,7 @@ public:
   void on_activate() override;
   void on_flushed() override;
   void on_removal(ObjectStore::Transaction *t) override;
-  void shutdown() override;
-  void on_shutdown();
+  void on_shutdown() override;
   bool check_failsafe_full() override;
   bool check_osdmap_full(const set<pg_shard_t> &missing_on) override;
   bool maybe_preempt_replica_scrub(const hobject_t& oid) override {