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

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

diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
index f087e8ec2234440890de4db8e36bde9b16f6abab..556a969946c53a87f6141ed8c032fd43ee5f3108 100644 (file)
--- 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);