From 49aeb040ee01460ea15330c58ec535f087f9bb88 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 15 Sep 2017 18:22:01 -0400 Subject: [PATCH] osd/PG: protect get_last_peering_reset Signed-off-by: Sage Weil --- src/osd/PG.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/PG.h b/src/osd/PG.h index a541dc42c6ee0..c56e18399de6c 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 &probe_set); -- 2.39.5