From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 4 Aug 2020 18:28:21 +0000 (-0400)
Subject: rbd: drop querying of RBD default features
X-Git-Tag: v15.2.14~31^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4913b38d6f74d225c041c8e59d4237132a4849f;p=ceph.git

rbd: drop querying of RBD default features

These will be computed internally by librbd using any potential
global configuration overrides.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 596d892e6023aeedf2fa4b178708c712d3180269)
---

diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index f397ea50e2cd..30eaccefc4ab 100644
--- a/src/tools/rbd/Utils.cc
+++ b/src/tools/rbd/Utils.cc
@@ -445,8 +445,6 @@ int get_image_options(const boost::program_options::variables_map &vm,
   if (vm.count(at::IMAGE_FEATURES)) {
     features = vm[at::IMAGE_FEATURES].as<uint64_t>();
     features_specified = true;
-  } else {
-    features = get_rbd_default_features(g_ceph_context);
   }
 
   if (vm.count(at::IMAGE_STRIPE_UNIT)) {