From: Sage Weil <sage@redhat.com>
Date: Tue, 7 Feb 2017 15:37:43 +0000 (-0500)
Subject: osd/OSDMap: fix kraken feature requirement
X-Git-Tag: v12.0.1~467^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2620cb33c3eb4fc931ccd230bd3086a1f5c99d52;p=ceph.git

osd/OSDMap: fix kraken feature requirement

Use the FEATUREMASK since this is a reused bit.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 4b5cb986314..9dcfee1dd01 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1101,7 +1101,7 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const
     }
     mask |= jewel_features;
 
-    const uint64_t kraken_features = CEPH_FEATURE_SERVER_KRAKEN
+    const uint64_t kraken_features = CEPH_FEATUREMASK_SERVER_KRAKEN
       | CEPH_FEATURE_MSG_ADDR2;
     if (test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) {
       features |= kraken_features;