diff options
author | Sage Weil <sage.weil@dreamhost.com> | 2012-02-01 12:53:24 -0800 |
---|---|---|
committer | Sage Weil <sage.weil@dreamhost.com> | 2012-02-01 12:53:24 -0800 |
commit | 252937487177251189ba95f226e2d38384d1a2a7 (patch) | |
tree | 509b8ed0e6e2d4c67ebd867111e49cb12679b280 /src/messages | |
parent | 1c5370cd9d07e3dd664c8013bc37eab090e4ea48 (diff) | |
download | ceph-252937487177251189ba95f226e2d38384d1a2a7.tar.gz |
osd: PG::Info -> pg_info_t
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Diffstat (limited to 'src/messages')
-rw-r--r-- | src/messages/MOSDPGInfo.h | 2 | ||||
-rw-r--r-- | src/messages/MOSDPGLog.h | 6 | ||||
-rw-r--r-- | src/messages/MOSDPGMissing.h | 4 | ||||
-rw-r--r-- | src/messages/MOSDPGNotify.h | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h index 21796f4b8cb..7e8fb57274b 100644 --- a/src/messages/MOSDPGInfo.h +++ b/src/messages/MOSDPGInfo.h @@ -23,7 +23,7 @@ class MOSDPGInfo : public Message { epoch_t epoch; public: - vector<PG::Info> pg_info; + vector<pg_info_t> pg_info; epoch_t get_epoch() { return epoch; } diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h index 774e1357ae9..832e053f8b6 100644 --- a/src/messages/MOSDPGLog.h +++ b/src/messages/MOSDPGLog.h @@ -27,7 +27,7 @@ class MOSDPGLog : public Message { epoch_t query_epoch; public: - PG::Info info; + pg_info_t info; PG::Log log; PG::Missing missing; @@ -36,10 +36,10 @@ public: epoch_t get_query_epoch() { return query_epoch; } MOSDPGLog() {} - MOSDPGLog(version_t mv, PG::Info& i) : + MOSDPGLog(version_t mv, pg_info_t& i) : Message(MSG_OSD_PG_LOG), epoch(mv), query_epoch(mv), info(i) { } - MOSDPGLog(version_t mv, PG::Info& i, epoch_t query_epoch) : + MOSDPGLog(version_t mv, pg_info_t& i, epoch_t query_epoch) : Message(MSG_OSD_PG_LOG), epoch(mv), query_epoch(query_epoch), info(i) { } private: diff --git a/src/messages/MOSDPGMissing.h b/src/messages/MOSDPGMissing.h index 17b6bdb8f82..55debebf30f 100644 --- a/src/messages/MOSDPGMissing.h +++ b/src/messages/MOSDPGMissing.h @@ -22,13 +22,13 @@ class MOSDPGMissing : public Message { epoch_t epoch; public: - PG::Info info; + pg_info_t info; PG::Missing missing; epoch_t get_epoch() { return epoch; } MOSDPGMissing() {} - MOSDPGMissing(version_t mv, const PG::Info &info_, + MOSDPGMissing(version_t mv, const pg_info_t &info_, const PG::Missing &missing_) : Message(MSG_OSD_PG_MISSING), epoch(mv), info(info_), missing(missing_) { } diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h index 3ea09b97adb..9c022d2443b 100644 --- a/src/messages/MOSDPGNotify.h +++ b/src/messages/MOSDPGNotify.h @@ -30,15 +30,15 @@ class MOSDPGNotify : public Message { /// query. This allows the recipient to disregard responses to old /// queries. epoch_t query_epoch; - vector<PG::Info> pg_list; // pgid -> version + vector<pg_info_t> pg_list; // pgid -> version public: version_t get_epoch() { return epoch; } - vector<PG::Info>& get_pg_list() { return pg_list; } + vector<pg_info_t>& get_pg_list() { return pg_list; } epoch_t get_query_epoch() { return query_epoch; } MOSDPGNotify() {} - MOSDPGNotify(epoch_t e, vector<PG::Info>& l, epoch_t query_epoch) : + MOSDPGNotify(epoch_t e, vector<pg_info_t>& l, epoch_t query_epoch) : Message(MSG_OSD_PG_NOTIFY), epoch(e), query_epoch(query_epoch) { pg_list.swap(l); @@ -65,7 +65,7 @@ public: } void print(ostream& out) const { out << "pg_notify("; - for (vector<PG::Info>::const_iterator i = pg_list.begin(); + for (vector<pg_info_t>::const_iterator i = pg_list.begin(); i != pg_list.end(); ++i) { if (i != pg_list.begin()) |