summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zafman <david.zafman@inktank.com>2013-04-05 17:04:14 -0700
committerDavid Zafman <david.zafman@inktank.com>2013-04-19 11:29:18 -0700
commit52d8240adf87fb969b5928d045ab0526f6a942db (patch)
tree1f38bd04adc83376b6465ad156257cfbb575ead9
parent5ffb3ef4c25d9bc19460803a2924f8dbe034d50c (diff)
downloadceph-52d8240adf87fb969b5928d045ab0526f6a942db.tar.gz
osd: Add OSD::make_infos_oid() as common function to create oid
Signed-off-by: David Zafman <david.zafman@inktank.com>
-rw-r--r--src/osd/OSD.cc2
-rw-r--r--src/osd/OSD.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ba502e6112d..8b3611fb3c2 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -151,7 +151,7 @@ OSDService::OSDService(OSD *osd) :
osd(osd),
whoami(osd->whoami), store(osd->store), clog(osd->clog),
pg_recovery_stats(osd->pg_recovery_stats),
- infos_oid(sobject_t("infos", CEPH_NOSNAP)),
+ infos_oid(OSD::make_infos_oid()),
cluster_messenger(osd->cluster_messenger),
client_messenger(osd->client_messenger),
logger(osd->logger),
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 5166ae74aa4..8251202faa3 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -517,6 +517,10 @@ public:
getline(ss, s);
return hobject_t(sobject_t(object_t(s.c_str()), 0));
}
+ static hobject_t make_infos_oid() {
+ hobject_t oid(sobject_t("infos", CEPH_NOSNAP));
+ return oid;
+ }
private: