RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

spurious conflicts

Browse Source 
git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1373 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
eestolan 2007-05-25 01:43:43 +00:00
parent e9b7e212de
commit 40f37d0bee
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trunk/ceph/client/Client.cc
View File

@ -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;

10
trunk/ceph/client/Client.h
View File

@ -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;