From: Kefu Chai Date: Tue, 12 Feb 2019 11:42:33 +0000 (+0800) Subject: common/ceph_context: hardwire module_type to CEPH_ENTITY_TYPE_OSD X-Git-Tag: v14.1.0~154^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b83335174a682315d266aaa5437f653a62f40a8d;p=ceph-ci.git common/ceph_context: hardwire module_type to CEPH_ENTITY_TYPE_OSD currently, crimson project is only targeting crimson-osd. Signed-off-by: Kefu Chai --- diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc index 7b124fed4c2..5c26e7473a9 100644 --- a/src/common/ceph_context.cc +++ b/src/common/ceph_context.cc @@ -65,7 +65,7 @@ CephContext::~CephContext() uint32_t CephContext::get_module_type() const { - return module_type; + return CEPH_ENTITY_TYPE_OSD; } CryptoRandom* CephContext::random() const diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h index ceb42e729bf..97595791f2a 100644 --- a/src/common/ceph_context.h +++ b/src/common/ceph_context.h @@ -77,8 +77,6 @@ public: private: std::unique_ptr _crypto_random; unsigned nref; -#warning fixme need to set module_type for seastar - int module_type; }; #else /* A CephContext represents the context held by a single library user.