From 3c77c4c5a1a342025a32af56f0c2d648394bb551 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 27 Jan 2014 17:13:19 -0800
Subject: [PATCH] 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>
---
 src/osd/OSDMap.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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();
-- 
2.47.3