]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd/ReplicatedPG: avoid dereferencing iterator at end()"
authorSamuel Just <sam.just@inktank.com>
Tue, 9 Sep 2014 19:34:48 +0000 (12:34 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 9 Sep 2014 19:36:45 +0000 (12:36 -0700)
This reverts commit ded1cf4a93d15ca3be312d296c3ab956109587e3.

src/osd/ReplicatedPG.cc

index 880a607934c76705167a1252cf220aeb937c5582..8ba1bdcaeef122356d23295f678b8c4b254e7d1e 100644 (file)
@@ -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());