From: Samuel Just <sam.just@inktank.com>
Date: Tue, 3 Jul 2012 17:47:53 +0000 (-0700)
Subject: OSD::PeeringWQ::_dequeue(PG*) drop pg refs
X-Git-Tag: v0.50~109^2~2^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe14c181daf77918e4f22cda701f06a2043a575e;p=ceph.git

OSD::PeeringWQ::_dequeue(PG*) drop pg refs

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

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 2fefde1ac32e..bfbecca3cf1b 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -581,10 +581,12 @@ private:
       for (list<PG*>::iterator i = peering_queue.begin();
 	   i != peering_queue.end();
 	   ) {
-	if (*i == pg)
+	if (*i == pg) {
 	  peering_queue.erase(i++);
-	else
+	  pg->put();
+	} else {
 	  ++i;
+	}
       }
     }
     bool _enqueue(PG *pg) {