]> git-server-git.apps.pok.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>
Wed, 8 Oct 2014 22:49:38 +0000 (15:49 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 46dfd9197548a9d7cf4e5aa86497d73d8cc5d6ae)

src/osd/PG.h

index 58753980f9df41e528b4b385b2a0a6dd15f73437..38ca6ad8f4b4d876e7ad35760cb468d645dffe67 100644 (file)
@@ -481,10 +481,7 @@ protected:
     void pop_front() {
       assert(!objects.empty());
       objects.erase(objects.begin());
-      if (objects.empty())
-       begin = end;
-      else
-       begin = objects.begin()->first;
+      trim();
     }
 
     /// dump