osd/PG: drop unused args to _prepare_write_info

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7534eaadb84bba72e250fb01c9805388a71b868b..44e907a6f09636e48d7650550937e9ff03f4c519 100644 (file)
--- 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<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)

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 1651f3b970bc2ad17266250ce2c02dd229bacc84..7a8f85b84d6456883a185b652c750083338b2ea5 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -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);

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index e5a5fec7caceb9c2f541aaf68505fa1c9c46637b..44f688077379499119c731c6243b67c060e75cd9 100644 (file)
--- 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<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);