]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSDMap: fix kraken feature requirement
authorSage Weil <sage@redhat.com>
Tue, 7 Feb 2017 15:37:43 +0000 (10:37 -0500)
committerSage Weil <sage@redhat.com>
Tue, 7 Feb 2017 15:37:43 +0000 (10:37 -0500)
Use the FEATUREMASK since this is a reused bit.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSDMap.cc

index 4b5cb986314846e952fae714c1e195f2f11b0ca7..9dcfee1dd01f95dcdaaf82cb6643f0d608744ae1 100644 (file)
@@ -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;