osd/PGLog: take ghobject_t instead of hobject_t

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

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index b36095a41486d3286b609f386b2f311198d7e248..45309ed2eb75ec3b13be924564af065c12236b90 100644 (file)
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -690,7 +690,7 @@ void PGLog::merge_log(ObjectStore::Transaction& t,
 }
 
 void PGLog::write_log(
-  ObjectStore::Transaction& t, const hobject_t &log_oid)
+  ObjectStore::Transaction& t, const ghobject_t &log_oid)
 {
   if (is_dirty()) {
     dout(10) << "write_log with: "
@@ -716,7 +716,7 @@ void PGLog::write_log(
 }
 
 void PGLog::write_log(ObjectStore::Transaction& t, pg_log_t &log,
-    const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors)
+    const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors)
 {
   _write_log(
     t, log, log_oid,
@@ -727,7 +727,7 @@ void PGLog::write_log(ObjectStore::Transaction& t, pg_log_t &log,
 
 void PGLog::_write_log(
   ObjectStore::Transaction& t, pg_log_t &log,
-  const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
+  const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
   eversion_t dirty_to,
   eversion_t dirty_from,
   eversion_t writeout_from,
@@ -805,7 +805,7 @@ void PGLog::_write_log(
   t.omap_setkeys(META_COLL, log_oid, keys);
 }
 
-bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
+bool PGLog::read_log(ObjectStore *store, coll_t coll, ghobject_t log_oid,
   const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
   IndexedLog &log,
   pg_missing_t &missing,
@@ -934,7 +934,7 @@ bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
   return rewrite_log;
 }
 
-void PGLog::read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
+void PGLog::read_log_old(ObjectStore *store, coll_t coll, ghobject_t log_oid,
                         const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
                         IndexedLog &log,
                         pg_missing_t &missing, ostringstream &oss,

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 1b78c3e0fe0fc610c402336c2f535b8ac59e9450..715be64ec42386c97f2d83f5c026be1316f3eafd 100644 (file)
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -543,14 +543,14 @@ public:
                 pg_info_t &info, LogEntryHandler *rollbacker,
                 bool &dirty_info, bool &dirty_big_info);
 
-  void write_log(ObjectStore::Transaction& t, const hobject_t &log_oid);
+  void write_log(ObjectStore::Transaction& t, const ghobject_t &log_oid);
 
   static void write_log(ObjectStore::Transaction& t, pg_log_t &log,
-    const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors);
+    const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors);
 
   static void _write_log(
     ObjectStore::Transaction& t, pg_log_t &log,
-    const hobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
+    const ghobject_t &log_oid, map<eversion_t, hobject_t> &divergent_priors,
     eversion_t dirty_to,
     eversion_t dirty_from,
     eversion_t writeout_from,
@@ -560,7 +560,7 @@ public:
     set<string> *log_keys_debug
     );
 
-  bool read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
+  bool read_log(ObjectStore *store, coll_t coll, ghobject_t log_oid,
                const pg_info_t &info, ostringstream &oss) {
     return read_log(
       store, coll, log_oid, info, divergent_priors,
@@ -569,7 +569,7 @@ public:
   }
 
   /// return true if the log should be rewritten
-  static bool read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
+  static bool read_log(ObjectStore *store, coll_t coll, ghobject_t log_oid,
     const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
     IndexedLog &log,
     pg_missing_t &missing, ostringstream &oss,
@@ -577,7 +577,7 @@ public:
     );
 
 protected:
-  static void read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
+  static void read_log_old(ObjectStore *store, coll_t coll, ghobject_t log_oid,
                           const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
                           IndexedLog &log,
                           pg_missing_t &missing, ostringstream &oss,