rbd-mirror: remove unneeded instance_ids parameter

Signed-off-by: Venky Shankar <vshankar@redhat.com>

diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc
index 03c5705b656a44196b90d6fce73738fe1e9671f9..65d2596770f9b646f00f020fd4ef9d221355cb16 100644 (file)
--- a/src/tools/rbd_mirror/image_map/Policy.cc
+++ b/src/tools/rbd_mirror/image_map/Policy.cc
@@ -141,8 +141,7 @@ void Policy::add_instances(const InstanceIds &instance_ids,
   }
 
   GlobalImageIds shuffle_global_image_ids;
-  do_shuffle_add_instances(m_map, m_image_states.size(), instance_ids,
-                           &shuffle_global_image_ids);
+  do_shuffle_add_instances(m_map, m_image_states.size(), &shuffle_global_image_ids);
   dout(5) << "shuffling global_image_ids=[" << shuffle_global_image_ids
           << "]" << dendl;
   for (auto& global_image_id : shuffle_global_image_ids) {

diff --git a/src/tools/rbd_mirror/image_map/Policy.h b/src/tools/rbd_mirror/image_map/Policy.h
index b5acab215fbe2d843e5ad4c01460baba4cc79a40..55f0974229f546ab29055eaece06689471df8563 100644 (file)
--- a/src/tools/rbd_mirror/image_map/Policy.h
+++ b/src/tools/rbd_mirror/image_map/Policy.h
@@ -65,7 +65,6 @@ protected:
   // shuffle images when instances are added/removed
   virtual void do_shuffle_add_instances(
       const InstanceToImageMap& map, size_t image_count,
-      const std::vector<std::string> &instance_ids,
       std::set<std::string> *remap_global_image_ids) = 0;
 
 private:

diff --git a/src/tools/rbd_mirror/image_map/SimplePolicy.cc b/src/tools/rbd_mirror/image_map/SimplePolicy.cc
index a606487adf1af7c42601340a5b14ff73acc1e911..71cbd1e34691a2e57ccecfcf2484d6dc74b37c3d 100644 (file)
--- a/src/tools/rbd_mirror/image_map/SimplePolicy.cc
+++ b/src/tools/rbd_mirror/image_map/SimplePolicy.cc
@@ -39,7 +39,6 @@ size_t SimplePolicy::calc_images_per_instance(const InstanceToImageMap& map,
 
 void SimplePolicy::do_shuffle_add_instances(
     const InstanceToImageMap& map, size_t image_count,
-    const std::vector<std::string> &instance_ids,
     std::set<std::string> *remap_global_image_ids) {
   uint64_t images_per_instance = calc_images_per_instance(map, image_count);
   dout(5) << "images per instance=" << images_per_instance << dendl;

diff --git a/src/tools/rbd_mirror/image_map/SimplePolicy.h b/src/tools/rbd_mirror/image_map/SimplePolicy.h
index 6a73cb624a6d9014487d12ae11d711b1ff0ca827..ad2071b2cb7a740453b3adce8f24dc8d0f93e31b 100644 (file)
--- a/src/tools/rbd_mirror/image_map/SimplePolicy.h
+++ b/src/tools/rbd_mirror/image_map/SimplePolicy.h
@@ -24,7 +24,6 @@ protected:
 
   void do_shuffle_add_instances(
       const InstanceToImageMap& map, size_t image_count,
-      const std::vector<std::string> &instance_ids,
       std::set<std::string> *remap_global_image_ids) override;
 
 private: