Merge pull request #10760: jewel: saw valgrind issues in ReplicatedPG…

…::new_repop Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Aug 17, 2016 · 6b6db48 · 6b6db48
2 parents 571a43f + dc154cd
commit 6b6db48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -8530,7 +8530,7 @@ ReplicatedPG::RepGather *ReplicatedPG::new_repop(
   return repop;
 }
 
-ReplicatedPG::RepGather *ReplicatedPG::new_repop(
+boost::intrusive_ptr<ReplicatedPG::RepGather> ReplicatedPG::new_repop(
   ObcLockManager &&manager,
   boost::optional<std::function<void(void)> > &&on_complete)
 {
@@ -8543,11 +8543,10 @@ ReplicatedPG::RepGather *ReplicatedPG::new_repop(
   repop->start = ceph_clock_now(cct);
 
   repop_queue.push_back(&repop->queue_item);
-  repop->get();
 
   osd->logger->inc(l_osd_op_wip);
 
-  return repop;
+  return boost::intrusive_ptr<RepGather>(repop);
 }
 
 void ReplicatedPG::remove_repop(RepGather *repop)

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
@@ -878,7 +878,7 @@ class ReplicatedPG : public PG, public PGBackend::Listener {
     OpContext *ctx,
     ObjectContextRef obc,
     ceph_tid_t rep_tid);
-  RepGather *new_repop(
+  boost::intrusive_ptr<RepGather> new_repop(
     ObcLockManager &&manager,
     boost::optional<std::function<void(void)> > &&on_complete);
   void remove_repop(RepGather *repop);