RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/PG: drop unused args to _prepare_write_info

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-09-23 11:08:45 -04:00
parent 655a3d74b3
commit f0cd1fe2d9
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/PG.cc
View File

@ -2782,9 +2782,8 @@ void PG::upgrade(ObjectStore *store)
int PG::_prepare_write_info(map<string,bufferlist> *km,
epoch_t epoch,
pg_info_t &info, coll_t coll,
pg_info_t &info,
map<epoch_t,pg_interval_t> &past_intervals,
ghobject_t &pgmeta_oid,
bool dirty_big_info,
bool dirty_epoch)
{
@ -2842,8 +2841,8 @@ void PG::prepare_write_info(map<string,bufferlist> *km)
unstable_stats.clear();
bool need_update_epoch = last_epoch < get_osdmap()->get_epoch();
int ret = _prepare_write_info(km, get_osdmap()->get_epoch(), info, coll,
past_intervals, pgmeta_oid,
int ret = _prepare_write_info(km, get_osdmap()->get_epoch(), info,
past_intervals,
dirty_big_info, need_update_epoch);
assert(ret == 0);
if (need_update_epoch)

3
src/osd/PG.h
View File

@ -2234,9 +2234,8 @@ private:
public:
static int _prepare_write_info(map<string,bufferlist> *km,
epoch_t epoch,
pg_info_t &info, coll_t coll,
pg_info_t &info,
map<epoch_t,pg_interval_t> &past_intervals,
ghobject_t &pgmeta_oid,
bool dirty_big_info,
bool dirty_epoch);
void write_if_dirty(ObjectStore::Transaction& t);

3
src/tools/ceph_objectstore_tool.cc
View File

@ -479,9 +479,8 @@ int write_info(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info,
map<string,bufferlist> km;
int ret = PG::_prepare_write_info(
&km, epoch,
info, coll,
info,
past_intervals,
pgmeta_oid,
true, true);
if (ret) cerr << "Failed to write info" << std::endl;
t.omap_setkeys(coll, pgmeta_oid, km);