From: Haomai Wang Date: Mon, 20 Jun 2016 02:45:45 +0000 (+0800) Subject: Revert "msg/msg_types.h: make members private in ..." X-Git-Tag: v11.0.0~117^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9804%2Fhead;p=ceph.git Revert "msg/msg_types.h: make members private in ..." --- diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index f476e67a8e94..dbda0c681935 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -9514,7 +9514,7 @@ void MDCache::kick_discovers(mds_rank_t who) void MDCache::handle_discover(MDiscover *dis) { mds_rank_t whoami = mds->get_nodeid(); - mds_rank_t from = mds_rank_t(dis->get_source_inst().name.num()); + mds_rank_t from = mds_rank_t(dis->get_source_inst().name._num); assert(from != whoami); diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index ebe987d6d259..3236f399d9d3 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -29,6 +29,7 @@ extern ostream& operator<<(ostream& out, const sockaddr_storage &ss); extern ostream& operator<<(ostream& out, const sockaddr *sa); class entity_name_t { +public: __u8 _type; int64_t _num;