From 4c6eb6e7209f37ced22fa8cbf6b45da1b632ca0d Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 7 Mar 2014 15:35:15 -0800 Subject: [PATCH] client: adapt to new objecter interface Signed-off-by: Yehuda Sadeh --- src/client/Client.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 4cd6f2f170e8e..b57c44a14efd8 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -193,7 +193,7 @@ Client::Client(Messenger *m, MonClient *mc) // osd interfaces osdmap = new OSDMap; // initially blank.. see mount() mdsmap = new MDSMap; - objecter = new Objecter(cct, messenger, monclient, osdmap, client_lock, timer, + objecter = new Objecter(cct, messenger, monclient, osdmap, 0, 0); objecter->set_client_incarnation(0); // client always 0, for now. writeback_handler = new ObjecterWriteback(objecter); @@ -364,11 +364,9 @@ int Client::init() } client_lock.Unlock(); - objecter->init_unlocked(); + objecter->init(); client_lock.Lock(); - objecter->init_locked(); - monclient->set_want_keys(CEPH_ENTITY_TYPE_MDS | CEPH_ENTITY_TYPE_OSD); monclient->sub_want("mdsmap", 0, 0); monclient->sub_want("osdmap", 0, CEPH_SUBSCRIBE_ONETIME); @@ -454,9 +452,8 @@ void Client::shutdown() assert(initialized); initialized = false; timer.shutdown(); - objecter->shutdown_locked(); + objecter->shutdown(); client_lock.Unlock(); - objecter->shutdown_unlocked(); monclient->shutdown(); if (logger) { -- 2.39.5