From 3a1fb17401897b0717cf1d264c6e6fdf99fc703f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 28 Jan 2014 18:46:37 -0800 Subject: [PATCH] OSDMap: fix deepish_copy_from Start with a shallow copy! Signed-off-by: Sage Weil (cherry picked from commit d0f13f54146694a197535795da15b8832ef4b56f) Conflicts: src/osd/OSDMap.h --- src/osd/OSDMap.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 3796516a982cc..6e2bac21422fd 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 >(*o.pg_temp)); osd_uuid.reset(new vector(*o.osd_uuid)); -- 2.39.5