Merge 984df3b into 283c2e7

ceph · Feb 27, 2015 · 7f96be5 · 7f96be5
2 parents 283c2e7 + 984df3b
commit 7f96be5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
@@ -2079,7 +2079,9 @@ class OSD : public Dispatcher,
       pg->put("SnapTrimWQ");
     }
     void _clear() {
-      osd->snap_trim_queue.clear();
+      while (PG *pg = _dequeue()) {
+	pg->put("SnapTrimWQ");
+      }
     }
   } snap_trim_wq;