summaryrefslogtreecommitdiff
path: root/src/osd/OSDMap.h
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2012-04-25 15:59:24 -0700
committerSage Weil <sage@newdream.net>2012-04-26 18:49:19 -0700
commit98b1d8f36cde3ea9ac73f1ef532bb45d99dfd538 (patch)
tree74f6d0cc754973d7e572d6f93bafece10f4375e7 /src/osd/OSDMap.h
parente0436cb900f8e3d8a3daf8f57e213028265ab74e (diff)
downloadceph-98b1d8f36cde3ea9ac73f1ef532bb45d99dfd538.tar.gz
osdmap: use shared_ptr for CrushWrapper
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'src/osd/OSDMap.h')
-rw-r--r--src/osd/OSDMap.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index edac29f055a..9580ea8f527 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -192,7 +192,7 @@ private:
string cluster_snapshot;
public:
- CrushWrapper crush; // hierarchical map
+ std::tr1::shared_ptr<CrushWrapper> crush; // hierarchical map
friend class OSDMonitor;
friend class PGMonitor;
@@ -204,7 +204,8 @@ private:
flags(0),
num_osd(0), max_osd(0),
osd_addrs(new addrs_s),
- cluster_snapshot_epoch(0) {
+ cluster_snapshot_epoch(0),
+ crush(new CrushWrapper) {
memset(&fsid, 0, sizeof(fsid));
}