From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 12 Feb 2019 15:43:49 +0000 (-0500)
Subject: rbd: added missing feature bitmask to name mapping
X-Git-Tag: v14.1.0~147^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26337%2Fhead;p=ceph.git

rbd: added missing feature bitmask to name mapping

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/Features.cc b/src/librbd/Features.cc
index 15b149313596..8623adb4ee34 100644
--- a/src/librbd/Features.cc
+++ b/src/librbd/Features.cc
@@ -19,6 +19,8 @@ static const std::map<std::string, uint64_t> RBD_FEATURE_MAP = {
   {RBD_FEATURE_NAME_DEEP_FLATTEN, RBD_FEATURE_DEEP_FLATTEN},
   {RBD_FEATURE_NAME_JOURNALING, RBD_FEATURE_JOURNALING},
   {RBD_FEATURE_NAME_DATA_POOL, RBD_FEATURE_DATA_POOL},
+  {RBD_FEATURE_NAME_OPERATIONS, RBD_FEATURE_OPERATIONS},
+  {RBD_FEATURE_NAME_MIGRATING, RBD_FEATURE_MIGRATING},
 };
 static_assert((RBD_FEATURE_MIGRATING << 1) > RBD_FEATURES_ALL,
 	      "new RBD feature added");
diff --git a/src/tools/rbd/ArgumentTypes.cc b/src/tools/rbd/ArgumentTypes.cc
index 036c8e00e15c..566dd21e1d2c 100644
--- a/src/tools/rbd/ArgumentTypes.cc
+++ b/src/tools/rbd/ArgumentTypes.cc
@@ -27,6 +27,7 @@ const std::map<uint64_t, std::string> ImageFeatures::FEATURE_MAPPING = {
   {RBD_FEATURE_JOURNALING, RBD_FEATURE_NAME_JOURNALING},
   {RBD_FEATURE_DATA_POOL, RBD_FEATURE_NAME_DATA_POOL},
   {RBD_FEATURE_OPERATIONS, RBD_FEATURE_NAME_OPERATIONS},
+  {RBD_FEATURE_MIGRATING, RBD_FEATURE_NAME_MIGRATING},
 };
 
 Format::Formatter Format::create_formatter(bool pretty) const {