From b47f21f78f757975e37c869f9d977a2a39efd29b Mon Sep 17 00:00:00 2001
From: kungf <yang.wang@easystack.cn>
Date: Mon, 28 Aug 2017 20:31:27 +0800
Subject: [PATCH] osd/PG: rm unused parameter in calc_ec_acting

Signed-off-by: yang.wang <yang.wang@easystack.cn>
---
 src/osd/PG.cc | 4 ----
 src/osd/PG.h  | 2 --
 2 files changed, 6 deletions(-)
 mode change 100644 => 100755 src/osd/PG.cc
 mode change 100644 => 100755 src/osd/PG.h

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
old mode 100644
new mode 100755
index 9223e1f6acafe..9502eca3f8762
--- 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 37a24f8cc711a..b75edfb17b31c
--- 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,
-- 
2.39.5