OSDMap: fix deepish_copy_from

Start with a shallow copy!

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit d0f13f54146694a197535795da15b8832ef4b56f)

Conflicts:

	src/osd/OSDMap.h

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 3796516a982cc320a6bcbedad8a0e183f4b52640..6e2bac21422fd2607e867c3492110b80651462cc 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -235,6 +235,7 @@ public:
   */
 
   void deepish_copy_from(const OSDMap& o) {
+    *this = o;
     pg_temp.reset(new map<pg_t,vector<int> >(*o.pg_temp));
     osd_uuid.reset(new vector<uuid_d>(*o.osd_uuid));