From ef60b1b502c94961858fbebc690410b0f9a6f317 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 2 Nov 2016 11:48:55 -0400 Subject: [PATCH] client: use unique_ptr for fsmap_user Signed-off-by: Patrick Donnelly --- src/client/Client.cc | 9 ++++----- src/client/Client.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 63eda341dfc..c9f69069f4b 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -247,7 +247,7 @@ Client::Client(Messenger *m, MonClient *mc) objecter_finisher(m->cct), tick_event(NULL), monclient(mc), messenger(m), whoami(mc->get_global_id()), - cap_epoch_barrier(0), fsmap_user(nullptr), + cap_epoch_barrier(0), last_tid(0), oldest_tid(0), last_flush_tid(1), initialized(false), authenticated(false), mounted(false), unmounting(false), @@ -2521,8 +2521,7 @@ void Client::handle_fs_map(MFSMap *m) void Client::handle_fs_map_user(MFSMapUser *m) { - delete fsmap_user; - fsmap_user = new FSMapUser; + fsmap_user.reset(new FSMapUser); *fsmap_user = m->get_fsmap(); m->put(); @@ -5442,12 +5441,12 @@ int Client::fetch_fsmap(bool user) ldout(cct, 10) << __func__ << " learned FSMap version " << fsmap_latest << dendl; if (user) { - if (fsmap_user == nullptr || fsmap_user->get_epoch() < fsmap_latest) { + if (!fsmap_user || fsmap_user->get_epoch() < fsmap_latest) { monclient->sub_want("fsmap.user", fsmap_latest, CEPH_SUBSCRIBE_ONETIME); monclient->renew_subs(); wait_on_list(waiting_for_fsmap); } - assert(fsmap_user != nullptr); + assert(fsmap_user); assert(fsmap_user->get_epoch() >= fsmap_latest); } else { if (!fsmap || fsmap->get_epoch() < fsmap_latest) { diff --git a/src/client/Client.h b/src/client/Client.h index 0051f387a46..81ac751552f 100644 --- a/src/client/Client.h +++ b/src/client/Client.h @@ -321,7 +321,7 @@ protected: // FSMap, for when using mds_command list waiting_for_fsmap; std::unique_ptr fsmap; - FSMapUser *fsmap_user; + std::unique_ptr fsmap_user; // MDS command state CommandTable command_table; -- 2.39.5