list -> vector

diff --git a/src/client/Client.cc b/src/client/Client.cc
index a462553eef3f33a15fb1220365d12c5a6b2037db..76e11c4e788cbabba9abe8590c8418f79e9c9cb3 100644 (file)
--- 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<inodeno_t>::iterator p = m->split_inos.begin();
+    for (vector<inodeno_t>::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<inodeno_t>::iterator p = m->split_realms.begin();
+    for (vector<inodeno_t>::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 fec86014db488fe972686263def9ffaffc7f85bb..da0da5f836de2d416f8e32ae1cb2553c1f2a71fd 100644 (file)
--- 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<inodeno_t> split_inos;
+  vector<inodeno_t> split_inos;
   for (xlist<CInode*>::iterator p = in->snaprealm->inodes_with_caps.begin(); !p.end(); ++p)
     split_inos.push_back((*p)->ino());
 
-  list<inodeno_t> split_realms;
+  vector<inodeno_t> split_realms;
   for (set<SnapRealm*>::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 0b9bab1154b153b4bf94c2dc31faad3d8daf9c7f..170168ba72b1ac8363d7ab78d0e72fd2ef989e0a 100644 (file)
--- 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<inodeno_t> split_inos;
-  list<inodeno_t> split_realms;
+  vector<inodeno_t> split_inos;
+  vector<inodeno_t> split_realms;
   
   MClientSnap(int o=0) : 
     Message(CEPH_MSG_CLIENT_SNAP),

diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h
index 2e030851ec7915503ad6cb3e24949d614c2ab75d..eeb761dbcd9473739fdc49c319181e2e8fd63af6 100644 (file)
--- 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> pg_info;
+  vector<PG::Info> pg_info;
 
   epoch_t get_epoch() { return epoch; }
 

diff --git a/src/messages/MOSDPGPeerAck.h b/src/messages/MOSDPGPeerAck.h
index 88b6ddf434c695379abc5c518ab1cbe97c640423..3eff70f689ea52fedd8447e1fe2cea41ffad7df1 100644 (file)
--- 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_t>                pg_dne;   // pg dne
+  vector<pg_t>                pg_dne;   // pg dne
   map<pg_t, PGReplicaInfo > 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 4e2dd64a4b53d7f8bc6eddb25dd0384d7622a60e..526803944bd6172d58dac86e06b92fda541e22f6 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2532,7 +2532,7 @@ void OSD::handle_pg_info(MOSDPGInfo *m)
   map<int,MOSDPGInfo*> info_map;
   int created = 0;
 
-  for (list<PG::Info>::iterator p = m->pg_info.begin();
+  for (vector<PG::Info>::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);