From 40f37d0bee38a016400dc7bf1d79754a0b65986a Mon Sep 17 00:00:00 2001 From: eestolan Date: Fri, 25 May 2007 01:43:43 +0000 Subject: [PATCH] spurious conflicts git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1373 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/client/Client.cc | 1 - trunk/ceph/client/Client.h | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/trunk/ceph/client/Client.cc b/trunk/ceph/client/Client.cc index 00874d206a4b8..c985649c4ae86 100644 --- a/trunk/ceph/client/Client.cc +++ b/trunk/ceph/client/Client.cc @@ -2966,7 +2966,6 @@ int Client::enumerate_layout(int fh, list& 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 ad2953f71dbd8..45d7430ee73f1 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; -- 2.39.5