summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-06-05 08:42:25 -0700
committerSage Weil <sage@inktank.com>2013-06-17 10:03:10 -0700
commitd3d88983bceaf508f2585cc6bf8fc304a0943ffe (patch)
tree182b1550862ea161c6ada482acb2878e380a0360
parent646d9ccc575bf91cf73fbfaf91ab4d04ed2b5981 (diff)
downloadceph-d3d88983bceaf508f2585cc6bf8fc304a0943ffe.tar.gz
messages/MMonHealth: remove unused flag field
This was initialized in (one of) the ctor(s), but not encoded/decoded, and not used. Remove it. This makes valgrind a happy. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 08bb8d510b5abd64f5b9f8db150bfc8bccaf9ce8)
-rw-r--r--src/messages/MMonHealth.h24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/messages/MMonHealth.h b/src/messages/MMonHealth.h
index c6a09b140d1..9608647f242 100644
--- a/src/messages/MMonHealth.h
+++ b/src/messages/MMonHealth.h
@@ -26,11 +26,8 @@ struct MMonHealth : public MMonQuorumService
OP_TELL = 1,
};
- static const uint32_t FLAG_DATA = 0x01;
-
int service_type;
int service_op;
- uint32_t flags;
// service specific data
DataStats data_stats;
@@ -39,8 +36,7 @@ struct MMonHealth : public MMonQuorumService
MMonHealth(uint32_t type, int op = 0) :
MMonQuorumService(MSG_MON_HEALTH, HEAD_VERSION),
service_type(type),
- service_op(op),
- flags(0)
+ service_op(op)
{ }
private:
@@ -58,15 +54,7 @@ public:
o << "mon_health( service " << get_service_type()
<< " op " << get_service_op_name()
<< " e " << get_epoch() << " r " << get_round()
- << " flags";
- if (!flags) {
- o << " none";
- } else {
- if (has_flag(FLAG_DATA)) {
- o << " data";
- }
- }
- o << " )";
+ << " )";
}
int get_service_type() const {
@@ -77,14 +65,6 @@ public:
return service_op;
}
- void set_flag(uint32_t f) {
- flags |= f;
- }
-
- bool has_flag(uint32_t f) const {
- return (flags & f);
- }
-
void decode_payload() {
bufferlist::iterator p = payload.begin();
service_decode(p);