From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Sep 2017 22:22:01 +0000 (-0400)
Subject: osd/PG: protect get_last_peering_reset
X-Git-Tag: v13.0.1~634^2~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49aeb040ee01460ea15330c58ec535f087f9bb88;p=ceph.git

osd/PG: protect get_last_peering_reset

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

diff --git a/src/osd/PG.h b/src/osd/PG.h
index a541dc42c6e..c56e18399de 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -331,9 +331,6 @@ public:
   bool is_primary() const {
     return pg_whoami == primary;
   }
-  epoch_t get_last_peering_reset() const {
-    return last_peering_reset;
-  }
   bool pg_has_reset_since(epoch_t e) {
     assert(is_locked());
     return deleting || e < get_last_peering_reset();
@@ -874,6 +871,9 @@ protected:
                                        // which are unfound on the primary
   epoch_t last_peering_reset;
 
+  epoch_t get_last_peering_reset() const {
+    return last_peering_reset;
+  }
 
   /* heartbeat peers */
   void set_probe_targets(const set<pg_shard_t> &probe_set);