From: Sage Weil <sage@inktank.com>
Date: Wed, 29 Jan 2014 02:46:37 +0000 (-0800)
Subject: OSDMap: fix deepish_copy_from
X-Git-Tag: v0.78~260
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0f13f54146694a197535795da15b8832ef4b56f;p=ceph.git

OSDMap: fix deepish_copy_from

Start with a shallow copy!

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

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