RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-16 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17304 from kungf/calc_replicated_acting

Browse Source 
osd/PG: remove unused parameter in calc_ec_acting

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2017-09-01 21:07:33 -05:00 committed by GitHub
commit 3ce39706ed
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/PG.cc Normal file → Executable file
View File

@ -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,
@ -1208,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,
@ -1395,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,
@ -1410,9 +1406,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,

3
src/osd/PG.h Normal file → Executable file
View File

@ -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,
@ -1103,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,