From: Michal Jarzabek <stiopa@gmail.com>
Date: Tue, 10 May 2016 19:12:23 +0000 (+0100)
Subject: osd/OSD.cc: make pistate a local struct
X-Git-Tag: v11.0.0~144^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2496eef79a334826ada812bd1fe576671e8cdcad;p=ceph.git

osd/OSD.cc: make pistate a local struct

It is only used within build_past_intervals_parallel, so it can be
moved inside it.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 13114349baf7..2f6fa6afa137 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3344,16 +3344,15 @@ void OSD::load_pgs()
  * follow the same logic, but do all pgs at the same time so that we
  * can make a single pass across the osdmap history.
  */
-struct pistate {
-  epoch_t start, end;
-  vector<int> old_acting, old_up;
-  epoch_t same_interval_since;
-  int primary;
-  int up_primary;
-};
-
 void OSD::build_past_intervals_parallel()
 {
+  struct pistate {
+    epoch_t start, end;
+    vector<int> old_acting, old_up;
+    epoch_t same_interval_since;
+    int primary;
+    int up_primary;
+  };
   map<PG*,pistate> pis;
 
   // calculate junction of map range