import 15.2.0 Octopus source

[ceph.git] / ceph / src / osd / Session.cc

diff --git a/ceph/src/osd/Session.cc b/ceph/src/osd/Session.cc
index 44b5817a37440fd2354161c67ec1cc17c240d385..c3699593e5aa5fb8e1ac928502c7f0ad5edb108e 100644 (file)
--- a/ceph/src/osd/Session.cc
+++ b/ceph/src/osd/Session.cc
@@ -11,7 +11,7 @@
 
 void Session::clear_backoffs()
 {
-  map<spg_t,map<hobject_t,set<BackoffRef>>> ls;
+  map<spg_t,map<hobject_t,set<ceph::ref_t<Backoff>>>> ls;
   {
     std::lock_guard l(backoff_lock);
     ls.swap(backoffs);
@@ -85,7 +85,7 @@ void Session::ack_backoff(
 bool Session::check_backoff(
   CephContext *cct, spg_t pgid, const hobject_t& oid, const Message *m)
 {
-  BackoffRef b(have_backoff(pgid, oid));
+  auto b = have_backoff(pgid, oid);
   if (b) {
     dout(10) << __func__ << " session " << this << " has backoff " << *b
             << " for " << *m << dendl;