From: Sage Weil <sage@newdream.net>
Date: Wed, 26 Apr 2017 18:04:12 +0000 (-0500)
Subject: Merge pull request #12720 from kylinstorage/wip-loop-invariant-code-motion
X-Git-Tag: v12.0.3~223
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=415dcb438a7bb1a4dc548d736c3611a949d6b12c;p=ceph.git

Merge pull request #12720 from kylinstorage/wip-loop-invariant-code-motion

osd/PG.cc: loop invariant code motion

Reviewed-by: Sage Weil <sage@redhat.com>
---

415dcb438a7bb1a4dc548d736c3611a949d6b12c
diff --cc src/osd/PG.cc
index f8c14131f6d,5270b18427b..49bd4863475
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -7995,10 -7724,10 +7996,10 @@@ PG::RecoveryState::GetMissing::GetMissi
  
      // We pull the log from the peer's last_epoch_started to ensure we
      // get enough log to detect divergent updates.
-     eversion_t since(pi.last_epoch_started, 0);
+     since.epoch = pi.last_epoch_started;
      assert(pi.last_update >= pg->info.log_tail);  // or else choose_acting() did a bad thing
      if (pi.log_tail <= since) {
 -      dout(10) << " requesting log+missing since " << since << " from osd." << *i << dendl;
 +      ldout(pg->cct, 10) << " requesting log+missing since " << since << " from osd." << *i << dendl;
        context< RecoveryMachine >().send_query(
  	*i,
  	pg_query_t(