From 65abcd480100516a7186ab6ffbf22907c5a3156c Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Fri, 25 May 2018 06:48:10 -0400 Subject: [PATCH] rbd-mirror: remove unneeded instance_ids parameter Signed-off-by: Venky Shankar --- src/tools/rbd_mirror/image_map/Policy.cc | 3 +-- src/tools/rbd_mirror/image_map/Policy.h | 1 - src/tools/rbd_mirror/image_map/SimplePolicy.cc | 1 - src/tools/rbd_mirror/image_map/SimplePolicy.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc index 03c5705b656a4..65d2596770f9b 100644 --- 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 b5acab215fbe2..55f0974229f54 100644 --- 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 &instance_ids, std::set *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 a606487adf1af..71cbd1e34691a 100644 --- 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 &instance_ids, std::set *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 6a73cb624a6d9..ad2071b2cb7a7 100644 --- 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 &instance_ids, std::set *remap_global_image_ids) override; private: -- 2.39.5