From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 18 Dec 2020 14:48:58 +0000 (-0500)
Subject: librbd/image: use internal feature flag mask when creating images
X-Git-Tag: v15.2.9~18^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9e5c8a46e4f05570be344841257bca45b76f97b;p=ceph.git

librbd/image: use internal feature flag mask when creating images

When validating the provided features for an image, utilize the
RBD_FEATURES_INTERNAL flag instead of just RBD_FEATURE_OPERATION.

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

diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc
index 83c75141cc0..386f53f64c9 100644
--- a/src/librbd/image/CreateRequest.cc
+++ b/src/librbd/image/CreateRequest.cc
@@ -38,7 +38,7 @@ int validate_features(CephContext *cct, uint64_t features) {
     lderr(cct) << "librbd does not support requested features." << dendl;
     return -ENOSYS;
   }
-  if ((features & RBD_FEATURE_OPERATIONS) != 0) {
+  if ((features & RBD_FEATURES_INTERNAL) != 0) {
     lderr(cct) << "cannot use internally controlled features" << dendl;
     return -EINVAL;
   }