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

osd/PG: rm unused parameter in calc_ec_acting

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
old mode 100644
new mode 100755
index 9223e1f6acaf..9502eca3f876
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1125,9 +1125,7 @@ void PG::calc_ec_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,
   bool restrict_to_up_acting,
   vector<int> *_want,
@@ -1410,9 +1408,7 @@ 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,
       restrict_to_up_acting,
       &want,
diff --git a/src/osd/PG.h b/src/osd/PG.h
old mode 100644
new mode 100755
index 37a24f8cc711..b75edfb17b31
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1089,9 +1089,7 @@ 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,
     bool restrict_to_up_acting,
     vector<int> *want,