From: Sage Weil <sage@inktank.com>
Date: Tue, 28 Jan 2014 01:13:19 +0000 (-0800)
Subject: OSDMap: use deepish_copy_from in remove_redundant_temporaries
X-Git-Tag: v0.78~266^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1137%2Fhead;p=ceph.git

OSDMap: use deepish_copy_from in remove_redundant_temporaries

Better not to open-code it.  We do a bit of extra work here, but it's worth
it.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 9032390b041..d4c36f5ec14 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1048,8 +1048,8 @@ void OSDMap::remove_redundant_temporaries(CephContext *cct, const OSDMap& osdmap
     }
   }
   if (!osdmap.primary_temp->empty()) {
-    OSDMap templess(osdmap);
-    templess.primary_temp.reset(new map<pg_t,int>(*osdmap.primary_temp));
+    OSDMap templess;
+    templess.deepish_copy_from(osdmap);
     templess.primary_temp->clear();
     for (map<pg_t,int>::iterator p = osdmap.primary_temp->begin();
         p != osdmap.primary_temp->end();