ReplicatedPG.cc: C_OSD_CommittedPushedObject move pg->put() to finish

This should clarify the ownership of the pg ref.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 3ba29d6baefc1a2091fa9c3de9b606667a7ca342..91249b5a939a833623049ea31520fe8040830b9e 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5330,7 +5330,6 @@ void ReplicatedPG::_committed_pushed_object(OpRequestRef op, epoch_t same_since,
     log_subop_stats(op, l_osd_sop_push_inb, l_osd_sop_push_lat);
 
   unlock();
-  put();
 }
 
 void ReplicatedPG::_applied_recovered_object(ObjectStore::Transaction *t, ObjectContext *obc)

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index e3dfe8df8d944ac1cecde61d466fc0e54c734ec9..a3876a851dd1f25451ed90b32e93da1569ebfc5c 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -755,6 +755,7 @@ protected:
     }
     void finish(int r) {
       pg->_committed_pushed_object(op, same_since, last_complete);
+      pg->put();
     }
   };