From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 17 May 2018 17:46:18 +0000 (-0400)
Subject: rbd-mirror: mask off implicitly enabled feature bits for new images
X-Git-Tag: v14.0.0~73^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f64fd0a70d834d0657d5be4f9336cc3bfdb4095f;p=ceph.git

rbd-mirror: mask off implicitly enabled feature bits for new images

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

diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
index 61c8a3ee4337..adc3ff433560 100644
--- a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
+++ b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
@@ -435,7 +435,9 @@ int CreateImageRequest<I>::validate_parent() {
 template <typename I>
 void CreateImageRequest<I>::populate_image_options(
     librbd::ImageOptions* image_options) {
-  image_options->set(RBD_IMAGE_OPTION_FEATURES, m_remote_image_ctx->features);
+  image_options->set(RBD_IMAGE_OPTION_FEATURES,
+                     (m_remote_image_ctx->features &
+                        ~RBD_FEATURES_IMPLICIT_ENABLE));
   image_options->set(RBD_IMAGE_OPTION_ORDER, m_remote_image_ctx->order);
   image_options->set(RBD_IMAGE_OPTION_STRIPE_UNIT,
                      m_remote_image_ctx->stripe_unit);