From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 18 Dec 2020 14:42:51 +0000 (-0500)
Subject: librbd/api: do not explicitly add the MIGRATION feature bit
X-Git-Tag: v14.2.17~65^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bacaedd2d5bf90de95aeb001f246e75d83320632;p=ceph.git

librbd/api: do not explicitly add the MIGRATION feature bit

This feature bit is automatically added to the source and destination
images via the cls method on the OSD.

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

Conflicts:
	src/librbd/api/Migration.cc
- no Migration<I>::prepare_import template in nautilus
---

diff --git a/src/librbd/api/Migration.cc b/src/librbd/api/Migration.cc
index 7fbc878f4ad5..47df20a9b960 100644
--- a/src/librbd/api/Migration.cc
+++ b/src/librbd/api/Migration.cc
@@ -424,7 +424,6 @@ int Migration<I>::prepare(librados::IoCtx& io_ctx,
     return -ENOSYS;
   }
   features &= ~RBD_FEATURES_INTERNAL;
-  features |= RBD_FEATURE_MIGRATING;
   opts.set(RBD_IMAGE_OPTION_FEATURES, features);
 
   uint64_t order = image_ctx->order;
@@ -456,7 +455,6 @@ int Migration<I>::prepare(librados::IoCtx& io_ctx,
                       false, cls::rbd::MIGRATION_STATE_PREPARING, "", nullptr);
   r = migration.prepare();
 
-  features &= ~RBD_FEATURE_MIGRATING;
   opts.set(RBD_IMAGE_OPTION_FEATURES, features);
 
   return r;