From 981922179956be15e4ddf94eead3fccaa841ee7b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Nov 2014 13:20:53 -0800 Subject: [PATCH] osd/PGLog: take ghobject_t instead of hobject_t Signed-off-by: Sage Weil --- src/osd/PGLog.cc | 10 +++++----- src/osd/PGLog.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index b36095a4148..45309ed2eb7 100644 --- 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 &divergent_priors) + const ghobject_t &log_oid, map &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 &divergent_priors, + const ghobject_t &log_oid, map &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 &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 &divergent_priors, IndexedLog &log, pg_missing_t &missing, ostringstream &oss, diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 1b78c3e0fe0..715be64ec42 100644 --- 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 &divergent_priors); + const ghobject_t &log_oid, map &divergent_priors); static void _write_log( ObjectStore::Transaction& t, pg_log_t &log, - const hobject_t &log_oid, map &divergent_priors, + const ghobject_t &log_oid, map &divergent_priors, eversion_t dirty_to, eversion_t dirty_from, eversion_t writeout_from, @@ -560,7 +560,7 @@ public: set *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 &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 &divergent_priors, IndexedLog &log, pg_missing_t &missing, ostringstream &oss,