From 12bff373d29f4cec8932aa1460da98dca711ec91 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 13 Mar 2019 17:17:35 -0700 Subject: [PATCH] osd: Fixes for 64-bit PG state Signed-off-by: David Zafman --- src/mon/PGMap.cc | 2 +- src/osd/PG.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 9967cad86234a..78731fd707911 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -2380,7 +2380,7 @@ void PGMap::get_health_checks( // Specialized state printer that takes account of inversion of // ACTIVE, CLEAN checks. - auto state_name = [](const uint32_t &state) { + auto state_name = [](const uint64_t &state) { // Special cases for the states that are inverted checks if (state == PG_STATE_CLEAN) { return std::string("unclean"); diff --git a/src/osd/PG.h b/src/osd/PG.h index 38c5dab2f3926..31cba4b9388a8 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -2932,7 +2932,7 @@ protected: bool is_complete() const { return info.last_complete == info.last_update; } bool should_send_notify() const { return send_notify; } - int get_state() const { return state; } + uint64_t get_state() const { return state; } bool is_active() const { return state_test(PG_STATE_ACTIVE); } bool is_activating() const { return state_test(PG_STATE_ACTIVATING); } bool is_peering() const { return state_test(PG_STATE_PEERING); } -- 2.39.5