Revert "osd: check against last_peering_reset in _activate_committed"

This reverts commit 86aa07d7a91ac23074e76551c3a6db3a5736cffa.

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index acbf15c2200d29eb13c102d48a30bf3a5007ac4c..bdcd67fee34f6e54515aa21e542ee75309848a75 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1305,7 +1305,7 @@ void PG::activate(ObjectStore::Transaction& t, list<Context*>& tfin,
 
   // find out when we commit
   get();   // for callback
-  tfin.push_back(new C_PG_ActivateCommitted(this, last_peering_reset,
+  tfin.push_back(new C_PG_ActivateCommitted(this, info.history.same_interval_since,
                                            get_osdmap()->get_cluster_inst(acting[0])));
   
   // initialize snap_trimq