From: Samuel Just <sam.just@inktank.com>
Date: Tue, 9 Sep 2014 19:34:48 +0000 (-0700)
Subject: Revert "osd/ReplicatedPG: avoid dereferencing iterator at end()"
X-Git-Tag: v0.86~110^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78d7499d72d58889ba73d46667c611cd6f50cb61;p=ceph.git

Revert "osd/ReplicatedPG: avoid dereferencing iterator at end()"

This reverts commit ded1cf4a93d15ca3be312d296c3ab956109587e3.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 880a607934c7..8ba1bdcaeef1 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -6442,7 +6442,7 @@ int ReplicatedPG::start_flush(
     vector<snapid_t>::iterator dnewest = p;
 
     // we may need to send a delete first
-    if (dnewest != snapset.snaps.end() && prev_snapc + 1 < *dnewest) {
+    if (prev_snapc + 1 < *dnewest) {
       while (p != snapset.snaps.end() && *p > prev_snapc)
 	++p;
       dsnapc.snaps = vector<snapid_t>(p, snapset.snaps.end());