]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: rm unused parameter in calc_replicated_acting 17304/head
authorkungf <yang.wang@easystack.cn>
Mon, 28 Aug 2017 12:33:07 +0000 (20:33 +0800)
committeryang.wang <yang.wang@easystack.cn>
Thu, 31 Aug 2017 03:16:20 +0000 (11:16 +0800)
Signed-off-by: yang.wang <yang.wang@easystack.cn>
src/osd/PG.cc
src/osd/PG.h

index 9502eca3f87625c5ac7c2e3ea537bfd394ce8392..22299e66a2472fa52b92cce9d8201883de988ea5 100755 (executable)
@@ -1206,7 +1206,6 @@ void PG::calc_replicated_acting(
   map<pg_shard_t, pg_info_t>::const_iterator auth_log_shard,
   unsigned size,
   const vector<int> &acting,
-  pg_shard_t acting_primary,
   const vector<int> &up,
   pg_shard_t up_primary,
   const map<pg_shard_t, pg_info_t> &all_info,
@@ -1393,7 +1392,6 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id,
       auth_log_shard,
       get_osdmap()->get_pg_size(info.pgid.pgid),
       acting,
-      primary,
       up,
       up_primary,
       all_info,
index b75edfb17b31c291f511590453172c8bb18d539f..2cf90d48b194ad8d2a0dd835bfc439e2769c5b61 100755 (executable)
@@ -1101,7 +1101,6 @@ public:
     map<pg_shard_t, pg_info_t>::const_iterator auth_log_shard,
     unsigned size,
     const vector<int> &acting,
-    pg_shard_t acting_primary,
     const vector<int> &up,
     pg_shard_t up_primary,
     const map<pg_shard_t, pg_info_t> &all_info,