]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: copy blacklist in better way. 8087/head
authorsongbaisen <song.baisen@zte.com.cn>
Mon, 14 Mar 2016 11:50:09 +0000 (19:50 +0800)
committersongbaisen <song.baisen@zte.com.cn>
Mon, 14 Mar 2016 11:58:38 +0000 (19:58 +0800)
Signed-off-by: song baisen song.baisen@zte.com.cn
src/osd/OSDMap.cc

index 855d33075e924b8ccee25ba5b2fbd0d8f04d4ea8..1848d036f4dcfda53387cb76214d616a8b153bd5 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #include "OSDMap.h"
-
+#include <algorithm>
 #include "common/config.h"
 #include "common/Formatter.h"
 #include "common/TextTable.h"
@@ -905,10 +905,7 @@ bool OSDMap::is_blacklisted(const entity_addr_t& a) const
 
 void OSDMap::get_blacklist(list<pair<entity_addr_t,utime_t> > *bl) const
 {
-  for (ceph::unordered_map<entity_addr_t,utime_t>::const_iterator it = blacklist.begin() ;
-                        it != blacklist.end(); ++it) {
-    bl->push_back(*it);
-  }
+   std::copy(blacklist.begin(), blacklist.end(), std::back_inserter(*bl));
 }
 
 void OSDMap::set_max_osd(int m)