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.67.6~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a1fb17401897b0717cf1d264c6e6fdf99fc703f;p=ceph.git

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 3796516a982..6e2bac21422 100644
--- 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));