From 9537a4b2caadfe75bf10fe23811a163aca5a9936 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 17 May 2018 13:46:18 -0400
Subject: [PATCH] rbd-mirror: mask off implicitly enabled feature bits for new
 images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f64fd0a70d834d0657d5be4f9336cc3bfdb4095f)
---
 src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
index f087e8ec22344..556a969946c53 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);
-- 
2.39.5