]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PG::BackfillInterval: use trim() in pop_front()
authorSamuel Just <sam.just@inktank.com>
Mon, 28 Oct 2013 22:49:23 +0000 (15:49 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 28 Oct 2013 23:03:58 +0000 (16:03 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/PG.h

index e26d2f487fbca78e2df9e44ee8cc556b271baca8..0ca9da5d301f3cf73ba62d842d123f9c0a0d4fae 100644 (file)
@@ -479,10 +479,7 @@ protected:
     void pop_front() {
       assert(!objects.empty());
       objects.erase(objects.begin());
-      if (objects.empty())
-       begin = end;
-      else
-       begin = objects.begin()->first;
+      trim();
     }
 
     /// dump