diff --git a/trunk/ceph/client/Client.cc b/trunk/ceph/client/Client.cc index 00874d206a4..c985649c4ae 100644 --- a/trunk/ceph/client/Client.cc +++ b/trunk/ceph/client/Client.cc @@ -2966,7 +2966,6 @@ int Client::enumerate_layout(int fh, list<ObjectExtent>& result, } - void Client::ms_handle_failure(Message *m, const entity_inst_t& inst) { entity_name_t dest = inst.name; diff --git a/trunk/ceph/client/Client.h b/trunk/ceph/client/Client.h index ad2953f71db..45d7430ee73 100644 --- a/trunk/ceph/client/Client.h +++ b/trunk/ceph/client/Client.h @@ -320,6 +320,11 @@ class Client : public Dispatcher { }; + // cluster descriptors + MDSMap *mdsmap; + OSDMap *osdmap; + + protected: Messenger *messenger; int whoami; @@ -366,11 +371,6 @@ class Client : public Dispatcher { void handle_client_request_forward(MClientRequestForward *reply); void handle_client_reply(MClientReply *reply); - - // cluster descriptors - MDSMap *mdsmap; - OSDMap *osdmap; - bool mounted; bool unmounting; Cond mount_cond;