From: Samuel Just <sam.just@inktank.com>
Date: Mon, 28 Oct 2013 22:49:23 +0000 (-0700)
Subject: PG::BackfillInterval: use trim() in pop_front()
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f955c51cbb30b878dac5851c161fc8acdc0e123a;p=ceph.git

PG::BackfillInterval: use trim() in pop_front()

Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 46dfd9197548a9d7cf4e5aa86497d73d8cc5d6ae)
---

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 58753980f9d..38ca6ad8f4b 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -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