From f0cd1fe2d96c831041b5c27703a29eb80d45150f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 23 Sep 2016 11:08:45 -0400 Subject: [PATCH] osd/PG: drop unused args to _prepare_write_info Signed-off-by: Sage Weil --- src/osd/PG.cc | 7 +++---- src/osd/PG.h | 3 +-- src/tools/ceph_objectstore_tool.cc | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 7534eaadb84..44e907a6f09 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -2782,9 +2782,8 @@ void PG::upgrade(ObjectStore *store) int PG::_prepare_write_info(map *km, epoch_t epoch, - pg_info_t &info, coll_t coll, + pg_info_t &info, map &past_intervals, - ghobject_t &pgmeta_oid, bool dirty_big_info, bool dirty_epoch) { @@ -2842,8 +2841,8 @@ void PG::prepare_write_info(map *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) diff --git a/src/osd/PG.h b/src/osd/PG.h index 1651f3b970b..7a8f85b84d6 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -2234,9 +2234,8 @@ private: public: static int _prepare_write_info(map *km, epoch_t epoch, - pg_info_t &info, coll_t coll, + pg_info_t &info, map &past_intervals, - ghobject_t &pgmeta_oid, bool dirty_big_info, bool dirty_epoch); void write_if_dirty(ObjectStore::Transaction& t); diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index e5a5fec7cac..44f68807737 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -479,9 +479,8 @@ int write_info(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info, map 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); -- 2.39.5