From: Sage Weil <sage@redhat.com>
Date: Fri, 5 Dec 2014 01:26:37 +0000 (-0800)
Subject: osd: drop infos_oid arg from PG::read_info()
X-Git-Tag: v0.91~23^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5877c069f65ab587552cdd788bd33ce4666d8767;p=ceph.git

osd: drop infos_oid arg from PG::read_info()

Only needed for legacy.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7d94b37a8082..3ef6eacff362 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2928,7 +2928,6 @@ std::string PG::get_corrupt_pg_log_name() const
 int PG::read_info(
   ObjectStore *store, spg_t pgid, const coll_t &coll, bufferlist &bl,
   pg_info_t &info, map<epoch_t,pg_interval_t> &past_intervals,
-  hobject_t &infos_oid,
   interval_set<snapid_t>  &snap_collections, __u8 &struct_v)
 {
   // try for v8 or later
@@ -2957,6 +2956,7 @@ int PG::read_info(
   }
 
   // legacy (ver < 8)
+  hobject_t infos_oid(OSD::make_infos_oid());
   bufferlist::iterator p = bl.begin();
   bufferlist lbl;
 
@@ -3020,9 +3020,8 @@ int PG::read_info(
 
 void PG::read_state(ObjectStore *store, bufferlist &bl)
 {
-  hobject_t legacy_infos_oid(OSD::make_infos_oid());
   int r = read_info(store, pg_id, coll, bl, info, past_intervals,
-		    legacy_infos_oid, snap_collections, info_struct_v);
+		    snap_collections, info_struct_v);
   assert(r >= 0);
 
   ostringstream oss;
diff --git a/src/osd/PG.h b/src/osd/PG.h
index e05dc6777299..793277ea5a7a 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2132,7 +2132,6 @@ public:
   static int read_info(
     ObjectStore *store, spg_t pgid, const coll_t &coll,
     bufferlist &bl, pg_info_t &info, map<epoch_t,pg_interval_t> &past_intervals,
-    hobject_t &infos_oid,
     interval_set<snapid_t>  &snap_collections, __u8 &);
   void read_state(ObjectStore *store, bufferlist &bl);
   static bool _has_removal_flag(ObjectStore *store, spg_t pgid);
diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 97abe51cbccc..87f2d94e5aac 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -719,7 +719,7 @@ int mark_pg_for_removal(ObjectStore *fs, spg_t pgid, ObjectStore::Transaction *t
   interval_set<snapid_t> snap_collections;
   __u8 struct_v;
   int r = PG::read_info(fs, pgid, coll, bl, info, past_intervals,
-			infos_oid, snap_collections, struct_v);
+			snap_collections, struct_v);
   if (r < 0) {
     cerr << __func__ << " error on read_info " << cpp_strerror(-r) << std::endl;
     return r;
@@ -2820,7 +2820,7 @@ int main(int argc, char **argv)
     interval_set<snapid_t> snap_collections;
     __u8 struct_ver;
     r = PG::read_info(fs, pgid, coll, bl, info, past_intervals,
-      infos_oid, snap_collections, struct_ver);
+		      snap_collections, struct_ver);
     if (r < 0) {
       cerr << "read_info error " << cpp_strerror(-r) << std::endl;
       ret = 1;