summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-04-17 13:31:19 -0700
committerSage Weil <sage@inktank.com>2013-04-17 13:31:19 -0700
commitd3afae1fc82889b77fe38425b7b2185fb2390e91 (patch)
tree707f18de5a6d2495cbf9bfafc374fbda5ad2c84a
parent593507ea7084179b4e1ec94aa6e00656fe5ebb19 (diff)
parentfb840c8ff75b0c66dfeed48e8558542fe3da4c24 (diff)
downloadceph-d3afae1fc82889b77fe38425b7b2185fb2390e91.tar.gz
Merge pull request #218 from dalgaaf/wip-da-sca-cppcheck
Two small fixes Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/osd/PG.cc1
-rw-r--r--src/osd/PG.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 90cfb5dff2d..f21882966da 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -89,6 +89,7 @@ PG::PG(OSDService *o, OSDMapRef curmap,
backfill_target(-1),
backfill_reserved(0),
backfill_reserving(0),
+ flushed(false),
pg_stats_lock("PG::pg_stats_lock"),
pg_stats_valid(false),
osr(osd->osr_registry.lookup_or_create(p, (stringify(p)))),
diff --git a/src/osd/PG.h b/src/osd/PG.h
index f437bafbb16..36560ac7893 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -502,8 +502,6 @@ public:
// [primary only] content recovery state
protected:
- bool prior_set_built;
-
struct PriorSet {
set<int> probe; /// current+prior OSDs we need to probe.
set<int> down; /// down osds that would normally be in @a probe and might be interesting.