From: songbaisen <song.baisen@zte.com.cn>
Date: Mon, 14 Mar 2016 11:50:09 +0000 (+0800)
Subject: osd: copy blacklist in better way.
X-Git-Tag: v11.0.0~136^2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8087%2Fhead;p=ceph.git

osd: copy blacklist in better way.

Signed-off-by: song baisen song.baisen@zte.com.cn
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 855d33075e92..1848d036f4dc 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -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)