From: kungf <yang.wang@easystack.cn>
Date: Mon, 28 Aug 2017 12:33:07 +0000 (+0800)
Subject: osd/PG: rm unused parameter in calc_replicated_acting
X-Git-Tag: v13.0.1~1070^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17304%2Fhead;p=ceph.git

osd/PG: rm unused parameter in calc_replicated_acting

Signed-off-by: yang.wang <yang.wang@easystack.cn>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 9502eca3f876..22299e66a247 100755
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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,
diff --git a/src/osd/PG.h b/src/osd/PG.h
index b75edfb17b31..2cf90d48b194 100755
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -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,