ReplicatedPG.cc: Fixes a bug in snap_trimmer where a pointer to a stack

	Cond is left in the mode.waiting_cond list.

Signed-off-by: Samuel Just <samuelj@hq.newdream.net>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 4405234c64b5d6ae63372ec1bd2a8ddee278e154..7e6a1e1b71c679cb8406bb2a4a45a18a83fbf019 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -548,12 +548,15 @@ bool ReplicatedPG::snap_trimmer()
       if (!mode.try_write(nobody)) {
        dout(10) << " can't write, waiting" << dendl;
        Cond cond;
-       mode.waiting_cond.push_back(&cond);
+       list<Cond*>::iterator q = mode.waiting_cond.insert(mode.waiting_cond.end(), &cond);
        while (!mode.try_write(nobody))
          cond.Wait(_lock);
+       mode.waiting_cond.erase(q);
        dout(10) << " done waiting" << dendl;
-       if (!is_primary() || !is_active())
+       if (!(current_set_started == info.history.last_epoch_started &&
+             is_active())) {
          break;
+       }
       }
 
       // load clone info