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 7fbc878f4ad5dbbf911fcbf139838ce89928ebd7..47df20a9b96012d9f6a163408cda419c486ff6d4 100644 (file)
--- 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;