From 116d8d1fc0fa5c7fd6da58f48ef83a59d9dbaf21 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Fri, 1 Mar 2013 13:33:12 +0100 Subject: [PATCH] mds/Server.cc: : use static_cast instead of C-Style cast Signed-off-by: Danny Al-Gaaf --- src/mds/Server.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 1dd3302c94d67..76fb57c06b51c 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -89,7 +89,7 @@ void Server::dispatch(Message *m) { switch (m->get_type()) { case CEPH_MSG_CLIENT_RECONNECT: - handle_client_reconnect((MClientReconnect*)m); + handle_client_reconnect(static_cast(m)); return; } @@ -98,17 +98,17 @@ void Server::dispatch(Message *m) !(mds->is_stopping() && m->get_source().is_mds())) { if ((mds->is_reconnect() || mds->get_want_state() == CEPH_MDS_STATE_RECONNECT) && m->get_type() == CEPH_MSG_CLIENT_REQUEST && - ((MClientRequest*)m)->is_replay()) { + (static_cast(m))->is_replay()) { dout(3) << "queuing replayed op" << dendl; mds->enqueue_replay(new C_MDS_RetryMessage(mds, m)); return; } else if (mds->is_clientreplay() && (m->get_type() == CEPH_MSG_CLIENT_SESSION || (m->get_type() == CEPH_MSG_CLIENT_REQUEST && - ((MClientRequest*)m)->is_replay()))) { + (static_cast(m))->is_replay()))) { // replaying! } else if (mds->is_clientreplay() && m->get_type() == MSG_MDS_SLAVE_REQUEST && - (((MMDSSlaveRequest*)m)->is_reply() || + ((static_cast(m))->is_reply() || !mds->mdsmap->is_active(m->get_source().num()))) { // slave reply or the master is also in the clientreplay stage } else { @@ -120,13 +120,13 @@ void Server::dispatch(Message *m) switch (m->get_type()) { case CEPH_MSG_CLIENT_SESSION: - handle_client_session((MClientSession*)m); + handle_client_session(static_cast(m)); return; case CEPH_MSG_CLIENT_REQUEST: - handle_client_request((MClientRequest*)m); + handle_client_request(static_cast(m)); return; case MSG_MDS_SLAVE_REQUEST: - handle_slave_request((MMDSSlaveRequest*)m); + handle_slave_request(static_cast(m)); return; } @@ -160,7 +160,7 @@ public: Session *Server::get_session(Message *m) { - Session *session = (Session *)m->get_connection()->get_priv(); + Session *session = static_cast(m->get_connection()->get_priv()); if (session) { dout(20) << "get_session have " << session << " " << session->info.inst << " state " << session->get_state_name() << dendl; @@ -293,7 +293,7 @@ void Server::_session_logged(Session *session, uint64_t state_seq, bool open, ve } while (!session->leases.empty()) { ClientLease *r = session->leases.front(); - CDentry *dn = (CDentry*)r->parent; + CDentry *dn = static_cast(r->parent); dout(20) << " killing client lease of " << *dn << dendl; dn->remove_client_lease(r, mds->locker); } @@ -1476,7 +1476,7 @@ void Server::dispatch_slave_request(MDRequest *mdr) break; } if (need_issue) - mds->locker->issue_caps((CInode*)lock->get_parent()); + mds->locker->issue_caps(static_cast(lock->get_parent())); // done. no ack necessary. mdr->slave_request->put(); @@ -1539,7 +1539,7 @@ void Server::handle_slave_auth_pin(MDRequest *mdr) objects.push_back(object); if (*p == mdr->slave_request->get_authpin_freeze()) - auth_pin_freeze = (CInode*)object; + auth_pin_freeze = static_cast(object); } // can we auth pin them? @@ -1630,7 +1630,7 @@ void Server::handle_slave_auth_pin_ack(MDRequest *mdr, MMDSSlaveRequest *ack) if (!mdr->is_auth_pinned(object)) mdr->remote_auth_pins.insert(object); if (*p == ack->get_authpin_freeze()) - mdr->set_remote_frozen_auth_pin((CInode *)object); + mdr->set_remote_frozen_auth_pin(static_cast(object)); pinned.insert(object); } -- 2.39.5