From fcc9095ede3d89350da2614bd77edd82ab752b86 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 7 Aug 2008 11:35:56 -0700 Subject: [PATCH] list -> vector --- src/client/Client.cc | 4 ++-- src/mds/MDCache.cc | 4 ++-- src/messages/MClientSnap.h | 4 ++-- src/messages/MOSDPGInfo.h | 2 +- src/messages/MOSDPGPeerAck.h | 2 +- src/osd/OSD.cc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index a462553eef3f3..76e11c4e788cb 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -1793,7 +1793,7 @@ void Client::handle_snap(MClientSnap *m) // flush, then move, ino's. realm = get_snap_realm(info.ino); dout(10) << " splitting off " << *realm << dendl; - for (list::iterator p = m->split_inos.begin(); + for (vector::iterator p = m->split_inos.begin(); p != m->split_inos.end(); p++) { vinodeno_t vino(*p, CEPH_NOSNAP); @@ -1823,7 +1823,7 @@ void Client::handle_snap(MClientSnap *m) } // move child snaprealms, too - for (list::iterator p = m->split_realms.begin(); + for (vector::iterator p = m->split_realms.begin(); p != m->split_realms.end(); p++) { dout(10) << "adjusting snaprealm " << *p << " parent" << dendl; diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index fec86014db488..da0da5f836de2 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -6119,11 +6119,11 @@ void MDCache::do_realm_split_notify(CInode *in) dout(10) << "do_realm_split_notify " << *in->snaprealm << " " << *in << dendl; // notify clients of update|split - list split_inos; + vector split_inos; for (xlist::iterator p = in->snaprealm->inodes_with_caps.begin(); !p.end(); ++p) split_inos.push_back((*p)->ino()); - list split_realms; + vector split_realms; for (set::iterator p = in->snaprealm->open_children.begin(); p != in->snaprealm->open_children.end(); p++) diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h index 0b9bab1154b15..170168ba72b1a 100644 --- a/src/messages/MClientSnap.h +++ b/src/messages/MClientSnap.h @@ -23,8 +23,8 @@ struct MClientSnap : public Message { // (for split only) inodeno_t split; - list split_inos; - list split_realms; + vector split_inos; + vector split_realms; MClientSnap(int o=0) : Message(CEPH_MSG_CLIENT_SNAP), diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h index 2e030851ec791..eeb761dbcd947 100644 --- a/src/messages/MOSDPGInfo.h +++ b/src/messages/MOSDPGInfo.h @@ -22,7 +22,7 @@ class MOSDPGInfo : public Message { epoch_t epoch; public: - list pg_info; + vector pg_info; epoch_t get_epoch() { return epoch; } diff --git a/src/messages/MOSDPGPeerAck.h b/src/messages/MOSDPGPeerAck.h index 88b6ddf434c69..3eff70f689ea5 100644 --- a/src/messages/MOSDPGPeerAck.h +++ b/src/messages/MOSDPGPeerAck.h @@ -23,7 +23,7 @@ class MOSDPGPeerAck : public Message { version_t map_version; public: - list pg_dne; // pg dne + vector pg_dne; // pg dne map pg_state; // state, lists, etc. version_t get_version() { return map_version; } diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 4e2dd64a4b53d..526803944bd61 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2532,7 +2532,7 @@ void OSD::handle_pg_info(MOSDPGInfo *m) map info_map; int created = 0; - for (list::iterator p = m->pg_info.begin(); + for (vector::iterator p = m->pg_info.begin(); p != m->pg_info.end(); ++p) _process_pg_info(m->get_epoch(), from, *p, empty_log, empty_missing, &info_map, created); -- 2.39.5