summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2013-03-01 10:18:57 -0800
committerSage Weil <sage@newdream.net>2013-03-01 10:18:57 -0800
commit84f48c3a8ddb0ed2aa246d557e499649541e7331 (patch)
tree61c75cdea46d334df9341cbb8501136713ba6332
parent96e9da1f546769b57889a2795570702bd7d43ad5 (diff)
parent1de23b5d9d1083dfc3b08718e01be14db44a5258 (diff)
downloadceph-84f48c3a8ddb0ed2aa246d557e499649541e7331.tar.gz
Merge pull request #87 from dalgaaf/wip-da-sca-style-2
Fix more issues found via cppcheck Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat
-rw-r--r--src/mds/CDir.h2
-rw-r--r--src/mds/Locker.cc135
-rw-r--r--src/mds/LogEvent.cc2
-rw-r--r--src/mds/MDBalancer.cc2
-rw-r--r--src/mds/MDBalancer.h2
-rw-r--r--src/mds/MDCache.cc40
-rw-r--r--src/mds/MDS.cc20
-rw-r--r--src/mds/Migrator.cc24
-rw-r--r--src/mds/Server.cc32
-rw-r--r--src/mds/events/ESession.h2
-rw-r--r--src/mds/flock.cc2
-rw-r--r--src/mon/AuthMonitor.cc2
-rw-r--r--src/mon/Elector.cc2
-rw-r--r--src/mon/LogMonitor.cc6
-rw-r--r--src/mon/MDSMonitor.cc12
-rw-r--r--src/mon/MonClient.cc11
-rw-r--r--src/mon/Monitor.cc42
-rw-r--r--src/mon/MonmapMonitor.cc9
-rw-r--r--src/mon/OSDMonitor.cc28
-rw-r--r--src/mon/PGMap.cc1
-rw-r--r--src/mon/PGMonitor.cc8
-rw-r--r--src/mon/Paxos.cc4
-rw-r--r--src/msg/Pipe.cc4
-rw-r--r--src/msg/SimpleMessenger.cc12
-rw-r--r--src/os/FileStore.cc10
-rw-r--r--src/os/IndexManager.cc2
-rw-r--r--src/os/LevelDBStore.h2
-rw-r--r--src/osd/OSD.cc53
-rw-r--r--src/osd/PG.cc19
-rw-r--r--src/osd/ReplicatedPG.cc45
-rw-r--r--src/osd/Watch.cc2
31 files changed, 260 insertions, 277 deletions
diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index 91e53d21a39..79946f15633 100644
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -165,7 +165,7 @@ public:
frag_t frag; // my frag
bool is_lt(const MDSCacheObject *r) const {
- return dirfrag() < ((const CDir*)r)->dirfrag();
+ return dirfrag() < (static_cast<const CDir*>(r))->dirfrag();
}
fnode_t fnode;
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 55e4a371ad2..712fb022866 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -72,22 +72,22 @@ void Locker::dispatch(Message *m)
// inter-mds locking
case MSG_MDS_LOCK:
- handle_lock((MLock*)m);
+ handle_lock(static_cast<MLock*>(m));
break;
// inter-mds caps
case MSG_MDS_INODEFILECAPS:
- handle_inode_file_caps((MInodeFileCaps*)m);
+ handle_inode_file_caps(static_cast<MInodeFileCaps*>(m));
break;
// client sync
case CEPH_MSG_CLIENT_CAPS:
- handle_client_caps((MClientCaps*)m);
+ handle_client_caps(static_cast<MClientCaps*>(m));
break;
case CEPH_MSG_CLIENT_CAPRELEASE:
- handle_client_cap_release((MClientCapRelease*)m);
+ handle_client_cap_release(static_cast<MClientCapRelease*>(m));
break;
case CEPH_MSG_CLIENT_LEASE:
- handle_client_lease((MClientLease*)m);
+ handle_client_lease(static_cast<MClientLease*>(m));
break;
default:
@@ -407,7 +407,7 @@ bool Locker::acquire_locks(MDRequest *mdr,
else
rdlock_finish(stray, mdr, &need_issue);
if (need_issue)
- issue_set.insert((CInode*)stray->get_parent());
+ issue_set.insert(static_cast<CInode*>(stray->get_parent()));
}
// lock
@@ -447,7 +447,7 @@ bool Locker::acquire_locks(MDRequest *mdr,
else
rdlock_finish(stray, mdr, &need_issue);
if (need_issue)
- issue_set.insert((CInode*)stray->get_parent());
+ issue_set.insert(static_cast<CInode*>(stray->get_parent()));
}
mdr->done_locking = true;
@@ -479,7 +479,7 @@ void Locker::_drop_rdlocks(Mutation *mut, set<CInode*> *pneed_issue)
MDSCacheObject *p = (*mut->rdlocks.begin())->get_parent();
rdlock_finish(*mut->rdlocks.begin(), mut, &ni);
if (ni)
- pneed_issue->insert((CInode*)p);
+ pneed_issue->insert(static_cast<CInode*>(p));
}
}
@@ -501,7 +501,7 @@ void Locker::_drop_non_rdlocks(Mutation *mut, set<CInode*> *pneed_issue)
bool ni = false;
xlock_finish(lock, mut, &ni);
if (ni)
- pneed_issue->insert((CInode*)p);
+ pneed_issue->insert(static_cast<CInode*>(p));
}
while (!mut->remote_wrlocks.empty()) {
@@ -515,7 +515,7 @@ void Locker::_drop_non_rdlocks(Mutation *mut, set<CInode*> *pneed_issue)
MDSCacheObject *p = (*mut->wrlocks.begin())->get_parent();
wrlock_finish(*mut->wrlocks.begin(), mut, &ni);
if (ni)
- pneed_issue->insert((CInode*)p);
+ pneed_issue->insert(static_cast<CInode*>(p));
}
for (set<int>::iterator p = slaves.begin(); p != slaves.end(); p++) {
@@ -542,7 +542,7 @@ void Locker::cancel_locking(Mutation *mut, set<CInode*> *pneed_issue)
if (lock->is_stable())
eval(lock, &need_issue);
if (need_issue)
- pneed_issue->insert((CInode *)lock->get_parent());
+ pneed_issue->insert(static_cast<CInode *>(lock->get_parent()));
}
} else {
lock->finish_waiters(SimpleLock::WAIT_REMOTEXLOCK);
@@ -604,7 +604,7 @@ void Locker::eval_gather(SimpleLock *lock, bool first, bool *pneed_issue, list<C
CInode *in = 0;
bool caps = lock->get_cap_shift();
if (lock->get_type() != CEPH_LOCK_DN)
- in = (CInode *)lock->get_parent();
+ in = static_cast<CInode *>(lock->get_parent());
bool need_issue = false;
@@ -673,13 +673,13 @@ void Locker::eval_gather(SimpleLock *lock, bool first, bool *pneed_issue, list<C
lock->encode_locked_state(reply->get_data());
mds->send_message_mds(reply, auth);
next = LOCK_MIX_SYNC2;
- ((ScatterLock *)lock)->start_flush();
+ (static_cast<ScatterLock *>(lock))->start_flush();
}
break;
case LOCK_MIX_SYNC2:
- ((ScatterLock *)lock)->finish_flush();
- ((ScatterLock *)lock)->clear_flushed();
+ (static_cast<ScatterLock *>(lock))->finish_flush();
+ (static_cast<ScatterLock *>(lock))->clear_flushed();
case LOCK_SYNC_MIX2:
// do nothing, we already acked
@@ -698,7 +698,7 @@ void Locker::eval_gather(SimpleLock *lock, bool first, bool *pneed_issue, list<C
bufferlist data;
lock->encode_locked_state(data);
mds->send_message_mds(new MLock(lock, LOCK_AC_LOCKACK, mds->get_nodeid(), data), auth);
- ((ScatterLock *)lock)->start_flush();
+ (static_cast<ScatterLock *>(lock))->start_flush();
// we'll get an AC_LOCKFLUSHED to complete
}
break;
@@ -722,7 +722,7 @@ void Locker::eval_gather(SimpleLock *lock, bool first, bool *pneed_issue, list<C
}
if (lock->is_dirty() && !lock->is_flushed()) {
- scatter_writebehind((ScatterLock*)lock);
+ scatter_writebehind(static_cast<ScatterLock *>(lock));
mds->mdlog->flush();
return;
}
@@ -733,13 +733,13 @@ void Locker::eval_gather(SimpleLock *lock, bool first, bool *pneed_issue, list<C
case LOCK_TSYN_MIX:
case LOCK_SYNC_MIX:
case LOCK_EXCL_MIX:
- in->start_scatter((ScatterLock *)lock);
+ in->start_scatter(static_cast<ScatterLock *>(lock));
if (lock->get_parent()->is_replicated()) {
bufferlist softdata;
lock->encode_locked_state(softdata);
send_lock_message(lock, LOCK_AC_MIX, softdata);
}
- ((ScatterLock*)lock)->clear_scatter_wanted();
+ (static_cast<ScatterLock *>(lock))->clear_scatter_wanted();
break;
// to sync
@@ -893,10 +893,10 @@ void Locker::try_eval(MDSCacheObject *p, int mask)
if (mask & CEPH_LOCK_DN) {
assert(mask == CEPH_LOCK_DN);
bool need_issue = false; // ignore this, no caps on dentries
- CDentry *dn = (CDentry *)p;
+ CDentry *dn = static_cast<CDentry *>(p);
eval_any(&dn->lock, &need_issue);
} else {
- CInode *in = (CInode *)p;
+ CInode *in = static_cast<CInode *>(p);
eval(in, mask);
}
}
@@ -937,7 +937,7 @@ void Locker::try_eval(SimpleLock *lock, bool *pneed_issue)
* checks above due to the auth_pin held by the master.
*/
if (lock->is_scatterlock()) {
- ScatterLock *slock = (ScatterLock *)lock;
+ ScatterLock *slock = static_cast<ScatterLock *>(lock);
if (slock->get_scatter_wanted() &&
slock->get_state() != LOCK_MIX) {
scatter_mix(slock, pneed_issue);
@@ -1011,10 +1011,10 @@ void Locker::eval(SimpleLock *lock, bool *need_issue)
{
switch (lock->get_type()) {
case CEPH_LOCK_IFILE:
- return file_eval((ScatterLock*)lock, need_issue);
+ return file_eval(static_cast<ScatterLock*>(lock), need_issue);
case CEPH_LOCK_IDFT:
case CEPH_LOCK_INEST:
- return scatter_eval((ScatterLock*)lock, need_issue);
+ return scatter_eval(static_cast<ScatterLock*>(lock), need_issue);
default:
return simple_eval(lock, need_issue);
}
@@ -1036,7 +1036,7 @@ bool Locker::_rdlock_kick(SimpleLock *lock, bool as_anon)
//else
simple_sync(lock);
} else if (lock->get_sm() == &sm_filelock) {
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
if (lock->get_state() == LOCK_EXCL &&
in->get_target_loner() >= 0 &&
!as_anon) // as_anon => caller wants SYNC, not XSYN
@@ -1091,7 +1091,7 @@ bool Locker::rdlock_start(SimpleLock *lock, MDRequest *mut, bool as_anon)
CInode *in = 0;
if (lock->get_type() != CEPH_LOCK_DN)
- in = (CInode *)lock->get_parent();
+ in = static_cast<CInode *>(lock->get_parent());
/*
if (!lock->get_parent()->is_auth() &&
@@ -1217,7 +1217,7 @@ void Locker::wrlock_force(SimpleLock *lock, Mutation *mut)
{
if (lock->get_type() == CEPH_LOCK_IVERSION ||
lock->get_type() == CEPH_LOCK_DVERSION)
- return local_wrlock_grab((LocalLock*)lock, mut);
+ return local_wrlock_grab(static_cast<LocalLock*>(lock), mut);
dout(7) << "wrlock_force on " << *lock
<< " on " << *lock->get_parent() << dendl;
@@ -1230,14 +1230,14 @@ bool Locker::wrlock_start(SimpleLock *lock, MDRequest *mut, bool nowait)
{
if (lock->get_type() == CEPH_LOCK_IVERSION ||
lock->get_type() == CEPH_LOCK_DVERSION)
- return local_wrlock_start((LocalLock*)lock, mut);
+ return local_wrlock_start(static_cast<LocalLock*>(lock), mut);
dout(10) << "wrlock_start " << *lock << " on " << *lock->get_parent() << dendl;
bool want_scatter = lock->get_parent()->is_auth() &&
((CInode*)lock->get_parent())->has_subtree_root_dirfrag();
- CInode *in = (CInode *)lock->get_parent();
+ CInode *in = static_cast<CInode *>(lock->get_parent());
client_t client = mut->get_client();
while (1) {
@@ -1260,7 +1260,7 @@ bool Locker::wrlock_start(SimpleLock *lock, MDRequest *mut, bool nowait)
return false;
if (want_scatter)
- scatter_mix((ScatterLock*)lock);
+ scatter_mix(static_cast<ScatterLock*>(lock));
else
simple_lock(lock);
@@ -1291,7 +1291,7 @@ void Locker::wrlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue)
{
if (lock->get_type() == CEPH_LOCK_IVERSION ||
lock->get_type() == CEPH_LOCK_DVERSION)
- return local_wrlock_finish((LocalLock*)lock, mut);
+ return local_wrlock_finish(static_cast<LocalLock*>(lock), mut);
dout(7) << "wrlock_finish on " << *lock << " on " << *lock->get_parent() << dendl;
lock->put_wrlock();
@@ -1362,7 +1362,7 @@ bool Locker::xlock_start(SimpleLock *lock, MDRequest *mut)
{
if (lock->get_type() == CEPH_LOCK_IVERSION ||
lock->get_type() == CEPH_LOCK_DVERSION)
- return local_xlock_start((LocalLock*)lock, mut);
+ return local_xlock_start(static_cast<LocalLock*>(lock), mut);
dout(7) << "xlock_start on " << *lock << " on " << *lock->get_parent() << dendl;
client_t client = mut->get_client();
@@ -1428,7 +1428,7 @@ bool Locker::xlock_start(SimpleLock *lock, MDRequest *mut)
void Locker::_finish_xlock(SimpleLock *lock, bool *pneed_issue)
{
assert(!lock->is_stable());
- if (lock->get_type() != CEPH_LOCK_DN && ((CInode*)lock->get_parent())->get_loner() >= 0)
+ if (lock->get_type() != CEPH_LOCK_DN && (static_cast<CInode*>(lock->get_parent())->get_loner()) >= 0)
lock->set_state(LOCK_EXCL);
else
lock->set_state(LOCK_LOCK);
@@ -1444,7 +1444,7 @@ void Locker::xlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue)
{
if (lock->get_type() == CEPH_LOCK_IVERSION ||
lock->get_type() == CEPH_LOCK_DVERSION)
- return local_xlock_finish((LocalLock*)lock, mut);
+ return local_xlock_finish(static_cast<LocalLock*>(lock), mut);
dout(10) << "xlock_finish on " << *lock << " " << *lock->get_parent() << dendl;
@@ -1495,7 +1495,7 @@ void Locker::xlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue)
try_eval(lock, &do_issue);
if (do_issue) {
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
if (in->is_head()) {
if (pneed_issue)
*pneed_issue = true;
@@ -1866,7 +1866,7 @@ void Locker::remove_stale_leases(Session *session)
while (!p.end()) {
ClientLease *l = *p;
++p;
- CDentry *parent = (CDentry*)l->parent;
+ CDentry *parent = static_cast<CDentry*>(l->parent);
dout(15) << " removing lease on " << *parent << dendl;
parent->remove_client_lease(l, this);
}
@@ -2982,13 +2982,12 @@ void Locker::handle_client_lease(MClientLease *m)
void Locker::issue_client_lease(CDentry *dn, client_t client,
bufferlist &bl, utime_t now, Session *session)
{
- int pool = 1; // fixme.. do something smart!
-
CInode *diri = dn->get_dir()->get_inode();
if (!diri->is_stray() && // do not issue dn leases in stray dir!
((!diri->filelock.can_lease(client) &&
(diri->get_client_cap_pending(client) & (CEPH_CAP_FILE_SHARED | CEPH_CAP_FILE_EXCL)) == 0)) &&
dn->lock.can_lease(client)) {
+ int pool = 1; // fixme.. do something smart!
// issue a dentry lease
ClientLease *l = dn->add_client_lease(client, session);
session->touch_lease(l);
@@ -3018,7 +3017,7 @@ void Locker::issue_client_lease(CDentry *dn, client_t client,
void Locker::revoke_client_leases(SimpleLock *lock)
{
int n = 0;
- CDentry *dn = (CDentry*)lock->get_parent();
+ CDentry *dn = static_cast<CDentry*>(lock->get_parent());
for (map<client_t, ClientLease*>::iterator p = dn->client_lease_map.begin();
p != dn->client_lease_map.end();
p++) {
@@ -3027,7 +3026,7 @@ void Locker::revoke_client_leases(SimpleLock *lock)
n++;
assert(lock->get_type() == CEPH_LOCK_DN);
- CDentry *dn = (CDentry*)lock->get_parent();
+ CDentry *dn = static_cast<CDentry*>(lock->get_parent());
int mask = 1 | CEPH_LOCK_DN; // old and new bits
// i should also revoke the dir ICONTENT lease, if they have it!
@@ -3136,7 +3135,7 @@ void Locker::handle_lock(MLock *m)
//break;
case CEPH_LOCK_IFILE:
- handle_file_lock((ScatterLock*)lock, m);
+ handle_file_lock(static_cast<ScatterLock*>(lock), m);
break;
default:
@@ -3293,7 +3292,7 @@ void Locker::simple_eval(SimpleLock *lock, bool *need_issue)
CInode *in = 0;
int wanted = 0;
if (lock->get_type() != CEPH_LOCK_DN) {
- in = (CInode*)lock->get_parent();
+ in = static_cast<CInode*>(lock->get_parent());
in->get_caps_wanted(&wanted, NULL, lock->get_cap_shift());
}
@@ -3328,7 +3327,7 @@ bool Locker::simple_sync(SimpleLock *lock, bool *need_issue)
CInode *in = 0;
if (lock->get_cap_shift())
- in = (CInode *)lock->get_parent();
+ in = static_cast<CInode *>(lock->get_parent());
int old_state = lock->get_state();
@@ -3372,7 +3371,7 @@ bool Locker::simple_sync(SimpleLock *lock, bool *need_issue)
if (!gather && lock->is_dirty()) {
lock->get_parent()->auth_pin(lock);
- scatter_writebehind((ScatterLock*)lock);
+ scatter_writebehind(static_cast<ScatterLock*>(lock));
mds->mdlog->flush();
return false;
}
@@ -3407,7 +3406,7 @@ void Locker::simple_excl(SimpleLock *lock, bool *need_issue)
CInode *in = 0;
if (lock->get_cap_shift())
- in = (CInode *)lock->get_parent();
+ in = static_cast<CInode *>(lock->get_parent());
switch (lock->get_state()) {
case LOCK_SCAN:
@@ -3464,7 +3463,7 @@ void Locker::simple_lock(SimpleLock *lock, bool *need_issue)
CInode *in = 0;
if (lock->get_cap_shift())
- in = (CInode *)lock->get_parent();
+ in = static_cast<CInode *>(lock->get_parent());
int old_state = lock->get_state();
@@ -3472,13 +3471,13 @@ void Locker::simple_lock(SimpleLock *lock, bool *need_issue)
case LOCK_SCAN: lock->set_state(LOCK_SCAN_LOCK); break;
case LOCK_SYNC: lock->set_state(LOCK_SYNC_LOCK); break;
case LOCK_XSYN:
- file_excl((ScatterLock*)lock, need_issue);
+ file_excl(static_cast<ScatterLock*>(lock), need_issue);
if (lock->get_state() != LOCK_EXCL)
return;
// fall-thru
case LOCK_EXCL: lock->set_state(LOCK_EXCL_LOCK); break;
case LOCK_MIX: lock->set_state(LOCK_MIX_LOCK);
- ((ScatterLock *)lock)->clear_unscatter_wanted();
+ (static_cast<ScatterLock *>(lock))->clear_unscatter_wanted();
break;
case LOCK_TSYN: lock->set_state(LOCK_TSYN_LOCK); break;
default: assert(0);
@@ -3527,7 +3526,7 @@ void Locker::simple_lock(SimpleLock *lock, bool *need_issue)
if (!gather && lock->is_dirty()) {
lock->get_parent()->auth_pin(lock);
- scatter_writebehind((ScatterLock*)lock);
+ scatter_writebehind(static_cast<ScatterLock*>(lock));
mds->mdlog->flush();
return;
}
@@ -3550,7 +3549,7 @@ void Locker::simple_xlock(SimpleLock *lock)
CInode *in = 0;
if (lock->get_cap_shift())
- in = (CInode *)lock->get_parent();
+ in = static_cast<CInode *>(lock->get_parent());
if (lock->is_stable())
lock->get_parent()->auth_pin(lock);
@@ -3627,7 +3626,7 @@ Some notes on scatterlocks.
void Locker::scatter_writebehind(ScatterLock *lock)
{
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
dout(10) << "scatter_writebehind " << in->inode.mtime << " on " << *lock << " on " << *in << dendl;
// journal
@@ -3661,7 +3660,7 @@ void Locker::scatter_writebehind(ScatterLock *lock)
void Locker::scatter_writebehind_finish(ScatterLock *lock, Mutation *mut)
{
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
dout(10) << "scatter_writebehind_finish on " << *lock << " on " << *in << dendl;
in->pop_and_dirty_projected_inode(mut->ls);
@@ -3725,7 +3724,7 @@ void Locker::scatter_eval(ScatterLock *lock, bool *need_issue)
return;
}
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
if (!in->has_subtree_root_dirfrag() || in->is_base()) {
// i _should_ be sync.
if (!lock->is_wrlocked() &&
@@ -3765,7 +3764,7 @@ void Locker::mark_updated_scatterlock(ScatterLock *lock)
*/
void Locker::scatter_nudge(ScatterLock *lock, Context *c, bool forcelockchange)
{
- CInode *p = (CInode *)lock->get_parent();
+ CInode *p = static_cast<CInode *>(lock->get_parent());
if (p->is_frozen() || p->is_freezing()) {
dout(10) << "scatter_nudge waiting for unfreeze on " << *p << dendl;
@@ -3813,11 +3812,11 @@ void Locker::scatter_nudge(ScatterLock *lock, Context *c, bool forcelockchange)
switch (lock->get_type()) {
case CEPH_LOCK_IFILE:
if (p->is_replicated() && lock->get_state() != LOCK_MIX)
- scatter_mix((ScatterLock*)lock);
+ scatter_mix(static_cast<ScatterLock*>(lock));
else if (lock->get_state() != LOCK_LOCK)
- simple_lock((ScatterLock*)lock);
+ simple_lock(static_cast<ScatterLock*>(lock));
else
- simple_sync((ScatterLock*)lock);
+ simple_sync(static_cast<ScatterLock*>(lock));
break;
case CEPH_LOCK_IDFT:
@@ -3902,7 +3901,7 @@ void Locker::scatter_tempsync(ScatterLock *lock, bool *need_issue)
assert(0 == "not fully implemented, at least not for filelock");
- CInode *in = (CInode *)lock->get_parent();
+ CInode *in = static_cast<CInode *>(lock->get_parent());
switch (lock->get_state()) {
case LOCK_SYNC: assert(0); // this shouldn't happen
@@ -4035,7 +4034,7 @@ void Locker::local_xlock_finish(LocalLock *lock, Mutation *mut)
void Locker::file_eval(ScatterLock *lock, bool *need_issue)
{
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
int loner_wanted, other_wanted;
int wanted = in->get_caps_wanted(&loner_wanted, &other_wanted, CEPH_CAP_SFILE);
dout(7) << "file_eval wanted=" << gcap_string(wanted)
@@ -4132,7 +4131,7 @@ void Locker::scatter_mix(ScatterLock *lock, bool *need_issue)
{
dout(7) << "scatter_mix " << *lock << " on " << *lock->get_parent() << dendl;
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
assert(in->is_auth());
assert(lock->is_stable());
@@ -4224,7 +4223,7 @@ void Locker::scatter_mix(ScatterLock *lock, bool *need_issue)
void Locker::file_excl(ScatterLock *lock, bool *need_issue)
{
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
dout(7) << "file_excl " << *lock << " on " << *lock->get_parent() << dendl;
assert(in->is_auth());
@@ -4287,7 +4286,7 @@ void Locker::file_excl(ScatterLock *lock, bool *need_issue)
void Locker::file_xsyn(SimpleLock *lock, bool *need_issue)
{
dout(7) << "file_xsyn on " << *lock << " on " << *lock->get_parent() << dendl;
- CInode *in = (CInode *)lock->get_parent();
+ CInode *in = static_cast<CInode *>(lock->get_parent());
assert(in->is_auth());
assert(in->get_loner() >= 0 && in->mds_caps_wanted.empty());
@@ -4323,7 +4322,7 @@ void Locker::file_xsyn(SimpleLock *lock, bool *need_issue)
void Locker::file_recover(ScatterLock *lock)
{
- CInode *in = (CInode *)lock->get_parent();
+ CInode *in = static_cast<CInode *>(lock->get_parent());
dout(7) << "file_recover " << *lock << " on " << *in << dendl;
assert(in->is_auth());
@@ -4358,7 +4357,7 @@ void Locker::file_recover(ScatterLock *lock)
/* This function DOES put the passed message before returning */
void Locker::handle_file_lock(ScatterLock *lock, MLock *m)
{
- CInode *in = (CInode*)lock->get_parent();
+ CInode *in = static_cast<CInode*>(lock->get_parent());
int from = m->get_asker();
if (mds->is_rejoin()) {
@@ -4390,8 +4389,8 @@ void Locker::handle_file_lock(ScatterLock *lock, MLock *m)
break;
}
- ((ScatterLock *)lock)->finish_flush();
- ((ScatterLock *)lock)->clear_flushed();
+ (static_cast<ScatterLock *>(lock))->finish_flush();
+ (static_cast<ScatterLock *>(lock))->clear_flushed();
// ok
lock->decode_locked_state(m->get_data());
@@ -4413,8 +4412,8 @@ void Locker::handle_file_lock(ScatterLock *lock, MLock *m)
break;
case LOCK_AC_LOCKFLUSHED:
- ((ScatterLock *)lock)->finish_flush();
- ((ScatterLock *)lock)->clear_flushed();
+ (static_cast<ScatterLock *>(lock))->finish_flush();
+ (static_cast<ScatterLock *>(lock))->clear_flushed();
break;
case LOCK_AC_MIX:
diff --git a/src/mds/LogEvent.cc b/src/mds/LogEvent.cc
index c4f18c756a9..b775b6d9501 100644
--- a/src/mds/LogEvent.cc
+++ b/src/mds/LogEvent.cc
@@ -77,7 +77,7 @@ LogEvent *LogEvent::decode_event(bufferlist& bl, bufferlist::iterator& p, __u32
case EVENT_RESETJOURNAL: le = new EResetJournal; break;
case EVENT_SESSION: le = new ESession; break;
- case EVENT_SESSIONS_OLD: le = new ESessions; ((ESessions *)le)->mark_old_encoding(); break;
+ case EVENT_SESSIONS_OLD: le = new ESessions; (static_cast<ESessions *>(le))->mark_old_encoding(); break;
case EVENT_SESSIONS: le = new ESessions; break;
case EVENT_UPDATE: le = new EUpdate; break;
diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index e39464c3b5f..cc0636891d8 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -54,7 +54,7 @@ int MDBalancer::proc_message(Message *m)
switch (m->get_type()) {
case MSG_MDS_HEARTBEAT:
- handle_heartbeat((MHeartbeat*)m);
+ handle_heartbeat(static_cast<MHeartbeat*>(m));
break;
default:
diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h
index 0aa931fdfe4..e73a08820a2 100644
--- a/src/mds/MDBalancer.h
+++ b/src/mds/MDBalancer.h
@@ -77,7 +77,7 @@ public:
MDBalancer(MDS *m) :
mds(m),
beat_epoch(0),
- last_epoch_under(0), last_epoch_over(0) { }
+ last_epoch_under(0), last_epoch_over(0), my_load(0.0), target_load(0.0) { }
mds_load_t get_load(utime_t);
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 32c87f9c688..c85627a4ab4 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -516,8 +516,8 @@ struct C_MDS_RetryOpenRoot : public Context {
void MDCache::open_root_inode(Context *c)
{
- CInode *in;
if (mds->whoami == mds->mdsmap->get_root()) {
+ CInode *in;
in = create_system_inode(MDS_INO_ROOT, S_IFDIR|0755); // initially inaccurate!
in->fetch(c);
} else {
@@ -1982,7 +1982,7 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob,
(!pin->can_auth_pin() ||
!pin->versionlock.can_wrlock() || // make sure we can take versionlock, too
//true
- !mds->locker->wrlock_start(&pin->nestlock, (MDRequest*)mut, true) // can cast only because i'm passing nowait=true
+ !mds->locker->wrlock_start(&pin->nestlock, static_cast<MDRequest*>(mut), true) // can cast only because i'm passing nowait=true
)) { // ** do not initiate.. see above comment **
dout(10) << "predirty_journal_parents can't wrlock one of " << pin->versionlock << " or " << pin->nestlock
<< " on " << *pin << dendl;
@@ -4739,7 +4739,6 @@ void MDCache::rejoin_gather_finish()
process_imported_caps();
choose_lock_states_and_reconnect_caps();
- vector<CInode*> recover_q, check_q;
identify_files_to_recover(rejoin_recover_q, rejoin_check_q);
rejoin_send_acks();
@@ -5674,7 +5673,7 @@ bool MDCache::trim(int max)
list<CDentry*> unexpirables;
// trim dentries from the LRU
while (lru.lru_get_size() + unexpirable > (unsigned)max) {
- CDentry *dn = (CDentry*)lru.lru_expire();
+ CDentry *dn = static_cast<CDentry*>(lru.lru_expire());
if (!dn) break;
if (is_standby_replay && dn->get_linkage() &&
dn->get_linkage()->inode->item_open_file.is_on_list()) {
@@ -5942,7 +5941,7 @@ void MDCache::trim_non_auth()
// trim non-auth items from the lru
while (lru.lru_get_size() > 0) {
- CDentry *dn = (CDentry*)lru.lru_expire();
+ CDentry *dn = static_cast<CDentry*>(lru.lru_expire());
if (!dn) break;
CDentry::linkage_t *dnl = dn->get_linkage();
@@ -6411,7 +6410,7 @@ void MDCache::trim_client_leases()
while (!client_leases[pool].empty()) {
ClientLease *r = client_leases[pool].front();
if (r->ttl > now) break;
- CDentry *dn = (CDentry*)r->parent;
+ CDentry *dn = static_cast<CDentry*>(r->parent);
dout(10) << " expiring client." << r->client << " lease of " << *dn << dendl;
dn->remove_client_lease(r, mds->locker);
}
@@ -6773,54 +6772,49 @@ void MDCache::dispatch(Message *m)
// RESOLVE
case MSG_MDS_RESOLVE:
- handle_resolve((MMDSResolve*)m);
+ handle_resolve(static_cast<MMDSResolve*>(m));
break;
case MSG_MDS_RESOLVEACK:
- handle_resolve_ack((MMDSResolveAck*)m);
+ handle_resolve_ack(static_cast<MMDSResolveAck*>(m));
break;
// REJOIN
case MSG_MDS_CACHEREJOIN:
- handle_cache_rejoin((MMDSCacheRejoin*)m);
+ handle_cache_rejoin(static_cast<MMDSCacheRejoin*>(m));
break;
case MSG_MDS_DISCOVER:
- handle_discover((MDiscover*)m);
+ handle_discover(static_cast<MDiscover*>(m));
break;
case MSG_MDS_DISCOVERREPLY:
- handle_discover_reply((MDiscoverReply*)m);
+ handle_discover_reply(static_cast<MDiscoverReply*>(m));
break;
case MSG_MDS_DIRUPDATE:
- handle_dir_update((MDirUpdate*)m);
+ handle_dir_update(static_cast<MDirUpdate*>(m));
break;
case MSG_MDS_CACHEEXPIRE:
- handle_cache_expire((MCacheExpire*)m);
+ handle_cache_expire(static_cast<MCacheExpire*>(m));
break;
-
-
case MSG_MDS_DENTRYLINK:
- handle_dentry_link((MDentryLink*)m);
+ handle_dentry_link(static_cast<MDentryLink*>(m));
break;
case MSG_MDS_DENTRYUNLINK:
- handle_dentry_unlink((MDentryUnlink*)m);
+ handle_dentry_unlink(static_cast<MDentryUnlink*>(m));
break;
-
case MSG_MDS_FRAGMENTNOTIFY:
- handle_fragment_notify((MMDSFragmentNotify*)m);
+ handle_fragment_notify(static_cast<MMDSFragmentNotify*>(m));
break;
-
case MSG_MDS_FINDINO:
- handle_find_ino((MMDSFindIno *)m);
+ handle_find_ino(static_cast<MMDSFindIno *>(m));
break;
case MSG_MDS_FINDINOREPLY:
- handle_find_ino_reply((MMDSFindInoReply *)m);
+ handle_find_ino_reply(static_cast<MMDSFindInoReply *>(m));
break;
-
default:
dout(7) << "cache unknown message " << m->get_type() << dendl;
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 387201cf9ba..a4b9fa56803 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -342,8 +342,8 @@ void MDS::forward_message_mds(Message *m, int mds)
// client request?
if (m->get_type() == CEPH_MSG_CLIENT_REQUEST &&
- ((MClientRequest*)m)->get_source().is_client()) {
- MClientRequest *creq = (MClientRequest*)m;
+ (static_cast<MClientRequest*>(m))->get_source().is_client()) {
+ MClientRequest *creq = static_cast<MClientRequest*>(m);
creq->inc_num_fwd(); // inc forward counter
/*
@@ -395,7 +395,7 @@ void MDS::send_message_client_counted(Message *m, client_t client)
void MDS::send_message_client_counted(Message *m, Connection *connection)
{
- Session *session = (Session *)connection->get_priv();
+ Session *session = static_cast<Session *>(connection->get_priv());
if (session) {
session->put(); // do not carry ref
send_message_client_counted(m, session);
@@ -992,7 +992,7 @@ void MDS::handle_mds_map(MMDSMap *m)
// is someone else newly resolving?
if (is_resolve() || is_rejoin() || is_clientreplay() || is_active() || is_stopping()) {
if (!oldmap->is_resolving() && mdsmap->is_resolving()) {
- set<int> oldresolve, resolve;
+ set<int> resolve;
mdsmap->get_mds_set(resolve, MDSMap::STATE_RESOLVE);
dout(10) << " resolve set is " << resolve << dendl;
calc_recovery_set();
@@ -1694,17 +1694,17 @@ bool MDS::handle_core_message(Message *m)
// MDS
case CEPH_MSG_MDS_MAP:
ALLOW_MESSAGES_FROM(CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_MDS);
- handle_mds_map((MMDSMap*)m);
+ handle_mds_map(static_cast<MMDSMap*>(m));
break;
case MSG_MDS_BEACON:
ALLOW_MESSAGES_FROM(CEPH_ENTITY_TYPE_MON);
- handle_mds_beacon((MMDSBeacon*)m);
+ handle_mds_beacon(static_cast<MMDSBeacon*>(m));
break;
// misc
case MSG_MON_COMMAND:
ALLOW_MESSAGES_FROM(CEPH_ENTITY_TYPE_MON);
- handle_command((MMonCommand*)m);
+ handle_command(static_cast<MMonCommand*>(m));
break;
// OSD
@@ -1766,7 +1766,7 @@ bool MDS::handle_deferrable_message(Message *m)
case MSG_MDS_TABLE_REQUEST:
ALLOW_MESSAGES_FROM(CEPH_ENTITY_TYPE_MDS);
{
- MMDSTableRequest *req = (MMDSTableRequest*)m;
+ MMDSTableRequest *req = static_cast<MMDSTableRequest*>(m);
if (req->op < 0) {
MDSTableClient *client = get_table_client(req->table);
client->handle_request(req);
@@ -2025,7 +2025,7 @@ bool MDS::ms_handle_reset(Connection *con)
if (con->get_peer_type() == CEPH_ENTITY_TYPE_OSD) {
objecter->ms_handle_reset(con);
} else if (con->get_peer_type() == CEPH_ENTITY_TYPE_CLIENT) {
- Session *session = (Session *)con->get_priv();
+ Session *session = static_cast<Session *>(con->get_priv());
if (session) {
if (session->is_closed()) {
messenger->mark_down(con->get_peer_addr());
@@ -2125,7 +2125,7 @@ bool MDS::ms_verify_authorizer(Connection *con, int peer_type,
void MDS::ms_handle_accept(Connection *con)
{
- Session *s = (Session *)con->get_priv();
+ Session *s = static_cast<Session *>(con->get_priv());
dout(10) << "ms_handle_accept " << con->get_peer_addr() << " con " << con << " session " << s << dendl;
if (s) {
s->put();
diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 123986908a1..5e538037531 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -86,46 +86,46 @@ void Migrator::dispatch(Message *m)
switch (m->get_type()) {
// import
case MSG_MDS_EXPORTDIRDISCOVER:
- handle_export_discover((MExportDirDiscover*)m);
+ handle_export_discover(static_cast<MExportDirDiscover*>(m));
break;
case MSG_MDS_EXPORTDIRPREP:
- handle_export_prep((MExportDirPrep*)m);
+ handle_export_prep(static_cast<MExportDirPrep*>(m));
break;
case MSG_MDS_EXPORTDIR:
- handle_export_dir((MExportDir*)m);
+ handle_export_dir(static_cast<MExportDir*>(m));
break;
case MSG_MDS_EXPORTDIRFINISH:
- handle_export_finish((MExportDirFinish*)m);
+ handle_export_finish(static_cast<MExportDirFinish*>(m));
break;
case MSG_MDS_EXPORTDIRCANCEL:
- handle_export_cancel((MExportDirCancel*)m);
+ handle_export_cancel(static_cast<MExportDirCancel*>(m));
break;
// export
case MSG_MDS_EXPORTDIRDISCOVERACK:
- handle_export_discover_ack((MExportDirDiscoverAck*)m);
+ handle_export_discover_ack(static_cast<MExportDirDiscoverAck*>(m));
break;
case MSG_MDS_EXPORTDIRPREPACK:
- handle_export_prep_ack((MExportDirPrepAck*)m);
+ handle_export_prep_ack(static_cast<MExportDirPrepAck*>(m));
break;
case MSG_MDS_EXPORTDIRACK:
- handle_export_ack((MExportDirAck*)m);
+ handle_export_ack(static_cast<MExportDirAck*>(m));
break;
case MSG_MDS_EXPORTDIRNOTIFYACK:
- handle_export_notify_ack((MExportDirNotifyAck*)m);
+ handle_export_notify_ack(static_cast<MExportDirNotifyAck*>(m));
break;
// export 3rd party (dir_auth adjustments)
case MSG_MDS_EXPORTDIRNOTIFY:
- handle_export_notify((MExportDirNotify*)m);
+ handle_export_notify(static_cast<MExportDirNotify*>(m));
break;
// caps
case MSG_MDS_EXPORTCAPS:
- handle_export_caps((MExportCaps*)m);
+ handle_export_caps(static_cast<MExportCaps*>(m));
break;
case MSG_MDS_EXPORTCAPSACK:
- handle_export_caps_ack((MExportCapsAck*)m);
+ handle_export_caps_ack(static_cast<MExportCapsAck*>(m));
break;
default:
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 1dd3302c94d..de7ad5a43e3 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<MClientReconnect*>(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<MClientRequest*>(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<MClientRequest*>(m))->is_replay()))) {
// replaying!
} else if (mds->is_clientreplay() && m->get_type() == MSG_MDS_SLAVE_REQUEST &&
- (((MMDSSlaveRequest*)m)->is_reply() ||
+ ((static_cast<MMDSSlaveRequest*>(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<MClientSession*>(m));
return;
case CEPH_MSG_CLIENT_REQUEST:
- handle_client_request((MClientRequest*)m);
+ handle_client_request(static_cast<MClientRequest*>(m));
return;
case MSG_MDS_SLAVE_REQUEST:
- handle_slave_request((MMDSSlaveRequest*)m);
+ handle_slave_request(static_cast<MMDSSlaveRequest*>(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<Session *>(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<CDentry*>(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<CInode*>(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<CInode*>(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<CInode *>(object));
pinned.insert(object);
}
@@ -6632,12 +6632,12 @@ void Server::_commit_slave_rename(MDRequest *mdr, int r,
CDentry::linkage_t *destdnl = destdn->get_linkage();
- ESlaveUpdate *le;
list<Context*> finished;
if (r == 0) {
// write a commit to the journal
- le = new ESlaveUpdate(mdlog, "slave_rename_commit", mdr->reqid, mdr->slave_to_mds,
- ESlaveUpdate::OP_COMMIT, ESlaveUpdate::RENAME);
+ ESlaveUpdate *le = new ESlaveUpdate(mdlog, "slave_rename_commit", mdr->reqid,
+ mdr->slave_to_mds, ESlaveUpdate::OP_COMMIT,
+ ESlaveUpdate::RENAME);
mdlog->start_entry(le);
// unfreeze+singleauth inode
@@ -6887,8 +6887,8 @@ void Server::do_rename_rollback(bufferlist &rbl, int master, MDRequest *mdr)
if (straydn)
destdn->push_projected_linkage();
- inode_t *ti = NULL;
if (target) {
+ inode_t *ti = NULL;
if (target->authority().first == whoami) {
ti = target->project_inode();
mut->add_projected_inode(target);
diff --git a/src/mds/events/ESession.h b/src/mds/events/ESession.h
index 91ad6c45ae4..95cd690fd15 100644
--- a/src/mds/events/ESession.h
+++ b/src/mds/events/ESession.h
@@ -30,7 +30,7 @@ class ESession : public LogEvent {
version_t inotablev;
public:
- ESession() : LogEvent(EVENT_SESSION) { }
+ ESession() : LogEvent(EVENT_SESSION), open(false) { }
ESession(const entity_inst_t& inst, bool o, version_t v) :
LogEvent(EVENT_SESSION),
client_inst(inst),
diff --git a/src/mds/flock.cc b/src/mds/flock.cc
index 0deb900f0b0..b2885177841 100644
--- a/src/mds/flock.cc
+++ b/src/mds/flock.cc
@@ -124,7 +124,7 @@ void ceph_lock_state_t::remove_lock(ceph_filelock removal_lock,
list<ceph_filelock>& activated_locks)
{
list<multimap<uint64_t, ceph_filelock>::iterator> overlapping_locks,
- self_overlapping_locks, crossed_waiting_locks;
+ self_overlapping_locks;
if (get_overlapping_locks(removal_lock, overlapping_locks)) {
dout(15) << "splitting by owner" << dendl;
split_by_owner(removal_lock, overlapping_locks, self_overlapping_locks);
diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 3e11c5e671c..da4fe92fb9a 100644
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -46,8 +46,6 @@ static ostream& _prefix(std::ostream *_dout, Monitor *mon, version_t v) {
ostream& operator<<(ostream& out, AuthMonitor& pm)
{
- std::stringstream ss;
-
return out << "auth";
}
diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 867ed8db02b..2b5bcc2ae88 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -314,7 +314,7 @@ void Elector::dispatch(Message *m)
return;
}
- MMonElection *em = (MMonElection*)m;
+ MMonElection *em = static_cast<MMonElection*>(m);
// assume an old message encoding would have matched
if (em->fsid != mon->monmap->fsid) {
diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index ed933285ac0..9aca7701d4d 100644
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -42,8 +42,8 @@ static ostream& _prefix(std::ostream *_dout, Monitor *mon, version_t v) {
ostream& operator<<(ostream& out, LogMonitor& pm)
{
- std::stringstream ss;
/*
+ std::stringstream ss;
for (hash_map<int,int>::iterator p = pm.pg_map.num_pg_by_state.begin();
p != pm.pg_map.num_pg_by_state.end();
++p) {
@@ -226,7 +226,7 @@ bool LogMonitor::preprocess_query(PaxosServiceMessage *m)
dout(10) << "preprocess_query " << *m << " from " << m->get_orig_source_inst() << dendl;
switch (m->get_type()) {
case MSG_MON_COMMAND:
- return preprocess_command((MMonCommand*)m);
+ return preprocess_command(static_cast<MMonCommand*>(m));
case MSG_LOG:
return preprocess_log((MLog*)m);
@@ -243,7 +243,7 @@ bool LogMonitor::prepare_update(PaxosServiceMessage *m)
dout(10) << "prepare_update " << *m << " from " << m->get_orig_source_inst() << dendl;
switch (m->get_type()) {
case MSG_MON_COMMAND:
- return prepare_command((MMonCommand*)m);
+ return prepare_command(static_cast<MMonCommand*>(m));
case MSG_LOG:
return prepare_log((MLog*)m);
default:
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index ae9921e446c..b5d8961a7af 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -152,13 +152,13 @@ bool MDSMonitor::preprocess_query(PaxosServiceMessage *m)
switch (m->get_type()) {
case MSG_MDS_BEACON:
- return preprocess_beacon((MMDSBeacon*)m);
+ return preprocess_beacon(static_cast<MMDSBeacon*>(m));
case MSG_MON_COMMAND:
- return preprocess_command((MMonCommand*)m);
+ return preprocess_command(static_cast<MMonCommand*>(m));
case MSG_MDS_OFFLOAD_TARGETS:
- return preprocess_offload_targets((MMDSLoadTargets*)m);
+ return preprocess_offload_targets(static_cast<MMDSLoadTargets*>(m));
default:
assert(0);
@@ -331,13 +331,13 @@ bool MDSMonitor::prepare_update(PaxosServiceMessage *m)
switch (m->get_type()) {
case MSG_MDS_BEACON:
- return prepare_beacon((MMDSBeacon*)m);
+ return prepare_beacon(static_cast<MMDSBeacon*>(m));
case MSG_MON_COMMAND:
- return prepare_command((MMonCommand*)m);
+ return prepare_command(static_cast<MMonCommand*>(m));
case MSG_MDS_OFFLOAD_TARGETS:
- return prepare_offload_targets((MMDSLoadTargets*)m);
+ return prepare_offload_targets(static_cast<MMDSLoadTargets*>(m));
default:
assert(0);
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 8f038ae7476..c655515ea53 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -18,6 +18,7 @@
#include "messages/MMonGetVersionReply.h"
#include "messages/MMonMap.h"
#include "messages/MAuth.h"
+#include "messages/MLogAck.h"
#include "messages/MAuthReply.h"
#include "messages/MMonSubscribe.h"
@@ -191,20 +192,20 @@ bool MonClient::ms_dispatch(Message *m)
switch (m->get_type()) {
case CEPH_MSG_MON_MAP:
- handle_monmap((MMonMap*)m);
+ handle_monmap(static_cast<MMonMap*>(m));
break;
case CEPH_MSG_AUTH_REPLY:
- handle_auth((MAuthReply*)m);
+ handle_auth(static_cast<MAuthReply*>(m));
break;
case CEPH_MSG_MON_SUBSCRIBE_ACK:
- handle_subscribe_ack((MMonSubscribeAck*)m);
+ handle_subscribe_ack(static_cast<MMonSubscribeAck*>(m));
break;
case CEPH_MSG_MON_GET_VERSION_REPLY:
- handle_get_version_reply((MMonGetVersionReply*)m);
+ handle_get_version_reply(static_cast<MMonGetVersionReply*>(m));
break;
case MSG_LOGACK:
if (log_client) {
- log_client->handle_log_ack((MLogAck*)m);
+ log_client->handle_log_ack(static_cast<MLogAck*>(m));
if (more_log_pending) {
send_log();
}
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 60a022bde25..529024cc1a8 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2674,7 +2674,7 @@ void Monitor::forward_request_leader(PaxosServiceMessage *req)
int mon = get_leader();
MonSession *session = 0;
if (req->get_connection())
- session = (MonSession *)req->get_connection()->get_priv();
+ session = static_cast<MonSession *>(req->get_connection()->get_priv());
if (req->session_mon >= 0) {
dout(10) << "forward_request won't double fwd request " << *req << dendl;
req->put();
@@ -2683,7 +2683,7 @@ void Monitor::forward_request_leader(PaxosServiceMessage *req)
rr->tid = ++routed_request_tid;
rr->client = req->get_source_inst();
encode_message(req, CEPH_FEATURES_ALL, rr->request_bl); // for my use only; use all features
- rr->session = (MonSession *)session->get();
+ rr->session = static_cast<MonSession *>(session->get());
routed_requests[rr->tid] = rr;
session->routed_request_tids.insert(rr->tid);
@@ -2705,7 +2705,7 @@ void Monitor::handle_forward(MForward *m)
{
dout(10) << "received forwarded message from " << m->client
<< " via " << m->get_source_inst() << dendl;
- MonSession *session = (MonSession *)m->get_connection()->get_priv();
+ MonSession *session = static_cast<MonSession *>(m->get_connection()->get_priv());
assert(session);
if (!session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_X)) {
@@ -2760,7 +2760,7 @@ void Monitor::try_send_message(Message *m, const entity_inst_t& to)
void Monitor::send_reply(PaxosServiceMessage *req, Message *reply)
{
- MonSession *session = (MonSession*)req->get_connection()->get_priv();
+ MonSession *session = static_cast<MonSession*>(req->get_connection()->get_priv());
if (!session) {
dout(2) << "send_reply no session, dropping reply " << *reply
<< " to " << req << " " << *req << dendl;
@@ -2781,7 +2781,7 @@ void Monitor::send_reply(PaxosServiceMessage *req, Message *reply)
void Monitor::no_reply(PaxosServiceMessage *req)
{
- MonSession *session = (MonSession*)req->get_connection()->get_priv();
+ MonSession *session = static_cast<MonSession*>(req->get_connection()->get_priv());
if (!session) {
dout(2) << "no_reply no session, dropping non-reply to " << req << " " << *req << dendl;
return;
@@ -2804,7 +2804,7 @@ void Monitor::no_reply(PaxosServiceMessage *req)
void Monitor::handle_route(MRoute *m)
{
- MonSession *session = (MonSession *)m->get_connection()->get_priv();
+ MonSession *session = static_cast<MonSession *>(m->get_connection()->get_priv());
//check privileges
if (session && !session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_X)) {
dout(0) << "MRoute received from entity without appropriate perms! "
@@ -2921,7 +2921,6 @@ bool Monitor::_ms_dispatch(Message *m)
Connection *connection = m->get_connection();
MonSession *s = NULL;
- bool reuse_caps = false;
MonCaps caps;
EntityName entity_name;
bool src_is_mon;
@@ -2929,8 +2928,9 @@ bool Monitor::_ms_dispatch(Message *m)
src_is_mon = !connection || (connection->get_peer_type() & CEPH_ENTITY_TYPE_MON);
if (connection) {
+ bool reuse_caps = false;
dout(20) << "have connection" << dendl;
- s = (MonSession *)connection->get_priv();
+ s = static_cast<MonSession *>(connection->get_priv());
if (s && s->closed) {
caps = s->caps;
reuse_caps = true;
@@ -3004,34 +3004,34 @@ bool Monitor::_ms_dispatch(Message *m)
switch (m->get_type()) {
case MSG_ROUTE:
- handle_route((MRoute*)m);
+ handle_route(static_cast<MRoute*>(m));
break;
// misc
case CEPH_MSG_MON_GET_MAP:
- handle_mon_get_map((MMonGetMap*)m);
+ handle_mon_get_map(static_cast<MMonGetMap*>(m));
break;
case CEPH_MSG_MON_GET_VERSION:
- handle_get_version((MMonGetVersion*)m);
+ handle_get_version(static_cast<MMonGetVersion*>(m));
break;
case MSG_MON_COMMAND:
- handle_command((MMonCommand*)m);
+ handle_command(static_cast<MMonCommand*>(m));
break;
case CEPH_MSG_MON_SUBSCRIBE:
/* FIXME: check what's being subscribed, filter accordingly */
- handle_subscribe((MMonSubscribe*)m);
+ handle_subscribe(static_cast<MMonSubscribe*>(m));
break;
case MSG_MON_PROBE:
- handle_probe((MMonProbe*)m);
+ handle_probe(static_cast<MMonProbe*>(m));
break;
// Sync (i.e., the new slurp, but on steroids)
case MSG_MON_SYNC:
- handle_sync((MMonSync*)m);
+ handle_sync(static_cast<MMonSync*>(m));
break;
// OSDs
@@ -3087,7 +3087,7 @@ bool Monitor::_ms_dispatch(Message *m)
// paxos
case MSG_MON_PAXOS:
{
- MMonPaxos *pm = (MMonPaxos*)m;
+ MMonPaxos *pm = static_cast<MMonPaxos*>(m);
if (!src_is_mon &&
!s->caps.check_privileges(PAXOS_MONMAP, MON_CAP_X)) {
//can't send these!
@@ -3144,11 +3144,11 @@ bool Monitor::_ms_dispatch(Message *m)
break;
case MSG_FORWARD:
- handle_forward((MForward *)m);
+ handle_forward(static_cast<MForward *>(m));
break;
case MSG_TIMECHECK:
- handle_timecheck((MTimeCheck *)m);
+ handle_timecheck(static_cast<MTimeCheck *>(m));
break;
default:
@@ -3540,7 +3540,7 @@ void Monitor::handle_subscribe(MMonSubscribe *m)
bool reply = false;
- MonSession *s = (MonSession *)m->get_connection()->get_priv();
+ MonSession *s = static_cast<MonSession *>(m->get_connection()->get_priv());
if (!s) {
dout(10) << " no session, dropping" << dendl;
m->put();
@@ -3593,7 +3593,7 @@ void Monitor::handle_get_version(MMonGetVersion *m)
{
dout(10) << "handle_get_version " << *m << dendl;
- MonSession *s = (MonSession *)m->get_connection()->get_priv();
+ MonSession *s = static_cast<MonSession *>(m->get_connection()->get_priv());
if (!s) {
dout(10) << " no session, dropping" << dendl;
m->put();
@@ -3632,7 +3632,7 @@ bool Monitor::ms_handle_reset(Connection *con)
if (con->get_peer_type() == CEPH_ENTITY_TYPE_MON)
return false;
- MonSession *s = (MonSession *)con->get_priv();
+ MonSession *s = static_cast<MonSession *>(con->get_priv());
if (!s)
return false;
diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 505327bd24d..1a86a0199ae 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -163,9 +163,9 @@ bool MonmapMonitor::preprocess_query(PaxosServiceMessage *m)
switch (m->get_type()) {
// READs
case MSG_MON_COMMAND:
- return preprocess_command((MMonCommand*)m);
+ return preprocess_command(static_cast<MMonCommand*>(m));
case MSG_MON_JOIN:
- return preprocess_join((MMonJoin*)m);
+ return preprocess_join(static_cast<MMonJoin*>(m));
default:
assert(0);
m->put();
@@ -219,7 +219,6 @@ bool MonmapMonitor::preprocess_command(MMonCommand *m)
string format = "plain";
string val;
epoch_t epoch = 0;
- string cmd = args[0];
for (std::vector<const char*>::iterator i = args.begin()+1; i != args.end(); ) {
if (ceph_argparse_double_dash(args, i))
break;
@@ -338,9 +337,9 @@ bool MonmapMonitor::prepare_update(PaxosServiceMessage *m)
switch (m->get_type()) {
case MSG_MON_COMMAND:
- return prepare_command((MMonCommand*)m);
+ return prepare_command(static_cast<MMonCommand*>(m));
case MSG_MON_JOIN:
- return prepare_join((MMonJoin*)m);
+ return prepare_join(static_cast<MMonJoin*>(m));
default:
assert(0);
m->put();
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 84cf4cbd791..b9acf85de60 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -537,23 +537,23 @@ bool OSDMonitor::preprocess_query(PaxosServiceMessage *m)
switch (m->get_type()) {
// READs
case MSG_MON_COMMAND:
- return preprocess_command((MMonCommand*)m);
+ return preprocess_command(static_cast<MMonCommand*>(m));
// damp updates
case MSG_OSD_FAILURE:
- return preprocess_failure((MOSDFailure*)m);
+ return preprocess_failure(static_cast<MOSDFailure*>(m));
case MSG_OSD_BOOT:
- return preprocess_boot((MOSDBoot*)m);
+ return preprocess_boot(static_cast<MOSDBoot*>(m));
case MSG_OSD_ALIVE:
- return preprocess_alive((MOSDAlive*)m);
+ return preprocess_alive(static_cast<MOSDAlive*>(m));
case MSG_OSD_PGTEMP:
- return preprocess_pgtemp((MOSDPGTemp*)m);
+ return preprocess_pgtemp(static_cast<MOSDPGTemp*>(m));
case CEPH_MSG_POOLOP:
- return preprocess_pool_op((MPoolOp*)m);
+ return preprocess_pool_op(static_cast<MPoolOp*>(m));
case MSG_REMOVE_SNAPS:
- return preprocess_remove_snaps((MRemoveSnaps*)m);
+ return preprocess_remove_snaps(static_cast<MRemoveSnaps*>(m));
default:
assert(0);
@@ -569,22 +569,22 @@ bool OSDMonitor::prepare_update(PaxosServiceMessage *m)
switch (m->get_type()) {
// damp updates
case MSG_OSD_FAILURE:
- return prepare_failure((MOSDFailure*)m);
+ return prepare_failure(static_cast<MOSDFailure*>(m));
case MSG_OSD_BOOT:
- return prepare_boot((MOSDBoot*)m);
+ return prepare_boot(static_cast<MOSDBoot*>(m));
case MSG_OSD_ALIVE:
- return prepare_alive((MOSDAlive*)m);
+ return prepare_alive(static_cast<MOSDAlive*>(m));
case MSG_OSD_PGTEMP:
- return prepare_pgtemp((MOSDPGTemp*)m);
+ return prepare_pgtemp(static_cast<MOSDPGTemp*>(m));
case MSG_MON_COMMAND:
- return prepare_command((MMonCommand*)m);
+ return prepare_command(static_cast<MMonCommand*>(m));
case CEPH_MSG_POOLOP:
- return prepare_pool_op((MPoolOp*)m);
+ return prepare_pool_op(static_cast<MPoolOp*>(m));
case MSG_REMOVE_SNAPS:
- return prepare_remove_snaps((MRemoveSnaps*)m);
+ return prepare_remove_snaps(static_cast<MRemoveSnaps*>(m));
default:
assert(0);
diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index ce896141875..1da32ea4448 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -672,7 +672,6 @@ void PGMap::recovery_summary(ostream& out) const
<< si_t(pg_sum_delta.stats.sum.num_bytes_recovered / (double)stamp_delta) << "B/s";
if (pg_sum_delta.stats.sum.num_keys_recovered)
out << ", " << si_t(pg_sum_delta.stats.sum.num_keys_recovered / (double)stamp_delta) << " key/s";
- first = false;
}
}
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 8245ed6ae6e..c1c6d6fe2d8 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -288,16 +288,16 @@ bool PGMonitor::preprocess_query(PaxosServiceMessage *m)
dout(10) << "preprocess_query " << *m << " from " << m->get_orig_source_inst() << dendl;
switch (m->get_type()) {
case CEPH_MSG_STATFS:
- handle_statfs((MStatfs*)m);
+ handle_statfs(static_cast<MStatfs*>(m));
return true;
case MSG_GETPOOLSTATS:
- return preprocess_getpoolstats((MGetPoolStats*)m);
+ return preprocess_getpoolstats(static_cast<MGetPoolStats*>(m));
case MSG_PGSTATS:
- return preprocess_pg_stats((MPGStats*)m);
+ return preprocess_pg_stats(static_cast<MPGStats*>(m));
case MSG_MON_COMMAND:
- return preprocess_command((MMonCommand*)m);
+ return preprocess_command(static_cast<MMonCommand*>(m));
default:
diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 9a47ec946d6..e8c0ca9342c 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -781,7 +781,7 @@ void Paxos::finish_proposal()
assert(mon->is_leader());
dout(10) << __func__ << " finishing proposal" << dendl;
- C_Proposal *proposal = (C_Proposal*) proposals.front();
+ C_Proposal *proposal = static_cast<C_Proposal*>(proposals.front());
dout(10) << __func__ << " finish it (proposal = "
<< proposal << ")" << dendl;;
@@ -1238,7 +1238,7 @@ void Paxos::propose_queued()
state = STATE_PREPARING;
- C_Proposal *proposal = (C_Proposal*) proposals.front();
+ C_Proposal *proposal = static_cast<C_Proposal*>(proposals.front());
assert(!proposal->proposed);
cancel_events();
diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index f5965be79e2..ad1fec007c7 100644
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -1585,9 +1585,9 @@ static void alloc_aligned_buffer(bufferlist& data, unsigned len, unsigned off)
{
// create a buffer to read into that matches the data alignment
unsigned left = len;
- unsigned head = 0;
if (off & ~CEPH_PAGE_MASK) {
// head
+ unsigned head = 0;
head = MIN(CEPH_PAGE_SIZE - (off & ~CEPH_PAGE_MASK), left);
bufferptr bp = buffer::create(head);
data.push_back(bp);
@@ -1650,10 +1650,10 @@ int Pipe::read_message(Message **pm)
int aborted;
Message *message;
utime_t recv_stamp = ceph_clock_now(msgr->cct);
- bool waited_on_throttle = false;
uint64_t message_size = header.front_len + header.middle_len + header.data_len;
if (message_size) {
+ bool waited_on_throttle = false;
if (policy.throttler) {
ldout(msgr->cct,10) << "reader wants " << message_size << " from policy throttler "
<< policy.throttler->get_current() << "/"
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index e3b378046d2..75fdf7b49dc 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -361,7 +361,7 @@ Connection *SimpleMessenger::get_connection(const entity_inst_t& dest)
Mutex::Locker l(lock);
if (my_inst.addr == dest.addr) {
// local
- return (Connection *)local_connection->get();
+ return static_cast<Connection *>(local_connection->get());
}
// remote
@@ -382,7 +382,7 @@ Connection *SimpleMessenger::get_connection(const entity_inst_t& dest)
Connection *SimpleMessenger::get_loopback_connection()
{
- return (Connection*)local_connection->get();
+ return static_cast<Connection*>(local_connection->get());
}
void SimpleMessenger::submit_message(Message *m, Connection *con,
@@ -472,7 +472,7 @@ int SimpleMessenger::send_keepalive(const entity_inst_t& dest)
int SimpleMessenger::send_keepalive(Connection *con)
{
int ret = 0;
- Pipe *pipe = (Pipe *)con->get_pipe();
+ Pipe *pipe = static_cast<Pipe *>(con->get_pipe());
if (pipe) {
ldout(cct,20) << "send_keepalive con " << con << ", have pipe." << dendl;
assert(pipe->msgr == this);
@@ -586,7 +586,7 @@ void SimpleMessenger::mark_down(const entity_addr_t& addr)
void SimpleMessenger::mark_down(Connection *con)
{
lock.Lock();
- Pipe *p = (Pipe *)con->get_pipe();
+ Pipe *p = static_cast<Pipe *>(con->get_pipe());
if (p) {
ldout(cct,1) << "mark_down " << con << " -- " << p << dendl;
assert(p->msgr == this);
@@ -604,7 +604,7 @@ void SimpleMessenger::mark_down(Connection *con)
void SimpleMessenger::mark_down_on_empty(Connection *con)
{
lock.Lock();
- Pipe *p = (Pipe *)con->get_pipe();
+ Pipe *p = static_cast<Pipe *>(con->get_pipe());
if (p) {
assert(p->msgr == this);
p->pipe_lock.Lock();
@@ -627,7 +627,7 @@ void SimpleMessenger::mark_down_on_empty(Connection *con)
void SimpleMessenger::mark_disposable(Connection *con)
{
lock.Lock();
- Pipe *p = (Pipe *)con->get_pipe();
+ Pipe *p = static_cast<Pipe *>(con->get_pipe());
if (p) {
ldout(cct,1) << "mark_disposable " << con << " -- " << p << dendl;
assert(p->msgr == this);
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index d487ba05d8e..d2e2763d2db 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1265,9 +1265,9 @@ int FileStore::_sanity_check_fs()
{
// sanity check(s)
- if ((int)m_filestore_journal_writeahead +
+ if (((int)m_filestore_journal_writeahead +
(int)m_filestore_journal_parallel +
- (int)m_filestore_journal_trailing > 1) {
+ (int)m_filestore_journal_trailing) > 1) {
dout(0) << "mount ERROR: more than one of filestore journal {writeahead,parallel,trailing} enabled" << dendl;
cerr << TEXT_RED
<< " ** WARNING: more than one of 'filestore journal {writeahead,parallel,trailing}'\n"
@@ -2029,7 +2029,7 @@ int FileStore::queue_transactions(Sequencer *posr, list<Transaction*> &tls,
if (!posr)
posr = &default_osr;
if (posr->p) {
- osr = (OpSequencer *)posr->p;
+ osr = static_cast<OpSequencer *>(posr->p);
dout(5) << "queue_transactions existing " << *osr << "/" << osr->parent << dendl; //<< " w/ q " << osr->q << dendl;
} else {
osr = new OpSequencer;
@@ -3610,10 +3610,8 @@ void FileStore::sync_and_flush()
if (journal)
journal->flush();
_flush_op_queue();
- } else if (m_filestore_journal_parallel) {
- _flush_op_queue();
- sync();
} else {
+ // includes m_filestore_journal_parallel
_flush_op_queue();
sync();
}
diff --git a/src/os/IndexManager.cc b/src/os/IndexManager.cc
index 11bf5c18172..412721a04c8 100644
--- a/src/os/IndexManager.cc
+++ b/src/os/IndexManager.cc
@@ -81,9 +81,9 @@ int IndexManager::init_index(coll_t c, const char *path, uint32_t version) {
}
int IndexManager::build_index(coll_t c, const char *path, Index *index) {
- int r;
if (upgrade) {
// Need to check the collection generation
+ int r;
uint32_t version = 0;
r = get_version(path, &version);
if (r < 0)
diff --git a/src/os/LevelDBStore.h b/src/os/LevelDBStore.h
index a867787a4d2..7f0e1542443 100644
--- a/src/os/LevelDBStore.h
+++ b/src/os/LevelDBStore.h
@@ -185,7 +185,7 @@ public:
return (key.compare(leveldb::Slice(past_prefix(prefix))) < 0) &&
(key.compare(leveldb::Slice(prefix)) > 0);
}
- static string past_prefix(const string prefix) {
+ static string past_prefix(const string &prefix) {
string limit = prefix;
limit.push_back(1);
return limit;
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8a4ea035081..b97ff5fcca0 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2282,7 +2282,7 @@ void OSD::heartbeat()
bool OSD::heartbeat_reset(Connection *con)
{
- HeartbeatSession *s = (HeartbeatSession*)con->get_priv();
+ HeartbeatSession *s = static_cast<HeartbeatSession*>(con->get_priv());
if (s) {
heartbeat_lock.Lock();
map<int,HeartbeatInfo>::iterator p = heartbeat_peers.find(s->peer);
@@ -2925,7 +2925,7 @@ void OSD::handle_command(MMonCommand *m)
void OSD::handle_command(MCommand *m)
{
Connection *con = m->get_connection();
- Session *session = (Session *)con->get_priv();
+ Session *session = static_cast<Session *>(con->get_priv());
if (!session) {
client_messenger->send_message(new MCommandReply(m, -EPERM), con);
m->put();
@@ -3276,7 +3276,7 @@ bool OSD::heartbeat_dispatch(Message *m)
break;
case MSG_OSD_PING:
- handle_osd_ping((MOSDPing*)m);
+ handle_osd_ping(static_cast<MOSDPing*>(m));
break;
case CEPH_MSG_OSD_MAP:
@@ -3370,7 +3370,7 @@ bool OSD::ms_verify_authorizer(Connection *con, int peer_type,
authorizer_data, authorizer_reply, name, global_id, caps_info, session_key, &auid);
if (isvalid) {
- Session *s = (Session *)con->get_priv();
+ Session *s = static_cast<Session *>(con->get_priv());
if (!s) {
s = new Session;
con->set_priv(s->get());
@@ -3500,12 +3500,12 @@ void OSD::_dispatch(Message *m)
// map and replication
case CEPH_MSG_OSD_MAP:
- handle_osd_map((MOSDMap*)m);
+ handle_osd_map(static_cast<MOSDMap*>(m));
break;
// osd
case CEPH_MSG_SHUTDOWN:
- session = (Session *)m->get_connection()->get_priv();
+ session = static_cast<Session *>(m->get_connection()->get_priv());
if (!session ||
session->entity_name.is_mon() ||
session->entity_name.is_osd())
@@ -3518,22 +3518,22 @@ void OSD::_dispatch(Message *m)
break;
case MSG_PGSTATSACK:
- handle_pg_stats_ack((MPGStatsAck*)m);
+ handle_pg_stats_ack(static_cast<MPGStatsAck*>(m));
break;
case MSG_MON_COMMAND:
- handle_command((MMonCommand*) m);
+ handle_command(static_cast<MMonCommand*>(m));
break;
case MSG_COMMAND:
- handle_command((MCommand*) m);
+ handle_command(static_cast<MCommand*>(m));
break;
case MSG_OSD_SCRUB:
- handle_scrub((MOSDScrub*)m);
+ handle_scrub(static_cast<MOSDScrub*>(m));
break;
case MSG_OSD_REP_SCRUB:
- handle_rep_scrub((MOSDRepScrub*)m);
+ handle_rep_scrub(static_cast<MOSDRepScrub*>(m));
break;
// -- need OSDMap --
@@ -3819,7 +3819,7 @@ void OSD::handle_osd_map(MOSDMap *m)
return;
}
- Session *session = (Session *)m->get_connection()->get_priv();
+ Session *session = static_cast<Session *>(m->get_connection()->get_priv());
if (session && !(session->entity_name.is_mon() || session->entity_name.is_osd())) {
//not enough perms!
m->put();
@@ -4180,8 +4180,6 @@ void OSD::advance_map(ObjectStore::Transaction& t, C_Contexts *tfin)
}
}
- map<int64_t, int> pool_resize; // poolid -> old size
-
// scan pg creations
hash_map<pg_t, create_pg_info>::iterator n = creating_pgs.begin();
while (n != creating_pgs.end()) {
@@ -5205,7 +5203,7 @@ void OSD::handle_pg_log(OpRequestRef op)
void OSD::handle_pg_info(OpRequestRef op)
{
- MOSDPGInfo *m = (MOSDPGInfo *)op->request;
+ MOSDPGInfo *m = static_cast<MOSDPGInfo *>(op->request);
assert(m->get_header().type == MSG_OSD_PG_INFO);
dout(7) << "handle_pg_info " << *m << " from " << m->get_source() << dendl;
@@ -5300,7 +5298,7 @@ void OSD::handle_pg_trim(OpRequestRef op)
void OSD::handle_pg_scan(OpRequestRef op)
{
- MOSDPGScan *m = (MOSDPGScan*)op->request;
+ MOSDPGScan *m = static_cast<MOSDPGScan*>(op->request);
assert(m->get_header().type == MSG_OSD_PG_SCAN);
dout(10) << "handle_pg_scan " << *m << " from " << m->get_source() << dendl;
@@ -5328,7 +5326,7 @@ void OSD::handle_pg_scan(OpRequestRef op)
void OSD::handle_pg_backfill(OpRequestRef op)
{
- MOSDPGBackfill *m = (MOSDPGBackfill*)op->request;
+ MOSDPGBackfill *m = static_cast<MOSDPGBackfill*>(op->request);
assert(m->get_header().type == MSG_OSD_PG_BACKFILL);
dout(10) << "handle_pg_backfill " << *m << " from " << m->get_source() << dendl;
@@ -5486,9 +5484,8 @@ void OSD::handle_pg_query(OpRequestRef op)
continue;
}
- PG *pg = 0;
-
if (pg_map.count(pgid)) {
+ PG *pg = 0;
pg = _lookup_lock_pg(pgid);
pg->queue_query(it->second.epoch_sent, it->second.epoch_sent,
from, it->second);
@@ -5838,7 +5835,7 @@ void OSDService::reply_op_error(OpRequestRef op, int err)
void OSDService::reply_op_error(OpRequestRef op, int err, eversion_t v)
{
- MOSDOp *m = (MOSDOp*)op->request;
+ MOSDOp *m = static_cast<MOSDOp*>(op->request);
assert(m->get_header().type == CEPH_MSG_OSD_OP);
int flags;
flags = m->get_flags() & (CEPH_OSD_FLAG_ACK|CEPH_OSD_FLAG_ONDISK);
@@ -5853,7 +5850,7 @@ void OSDService::reply_op_error(OpRequestRef op, int err, eversion_t v)
void OSDService::handle_misdirected_op(PG *pg, OpRequestRef op)
{
- MOSDOp *m = (MOSDOp*)op->request;
+ MOSDOp *m = static_cast<MOSDOp*>(op->request);
assert(m->get_header().type == CEPH_MSG_OSD_OP);
if (m->get_map_epoch() < pg->info.history.same_primary_since) {
@@ -5872,7 +5869,7 @@ void OSDService::handle_misdirected_op(PG *pg, OpRequestRef op)
void OSD::handle_op(OpRequestRef op)
{
- MOSDOp *m = (MOSDOp*)op->request;
+ MOSDOp *m = static_cast<MOSDOp*>(op->request);
assert(m->get_header().type == CEPH_MSG_OSD_OP);
if (op_is_discardable(m)) {
dout(10) << " discardable " << *m << dendl;
@@ -5902,7 +5899,7 @@ void OSD::handle_op(OpRequestRef op)
}
// share our map with sender, if they're old
_share_map_incoming(m->get_source(), m->get_connection(), m->get_map_epoch(),
- (Session *)m->get_connection()->get_priv());
+ static_cast<Session *>(m->get_connection()->get_priv()));
if (op->rmw_flags == 0) {
int r = init_op_flags(op);
@@ -6005,7 +6002,7 @@ void OSD::handle_op(OpRequestRef op)
void OSD::handle_sub_op(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
dout(10) << "handle_sub_op " << *m << " epoch " << m->map_epoch << dendl;
@@ -6029,7 +6026,7 @@ void OSD::handle_sub_op(OpRequestRef op)
// share our map with sender, if they're old
_share_map_incoming(m->get_source(), m->get_connection(), m->map_epoch,
- (Session*)m->get_connection()->get_priv());
+ static_cast<Session*>(m->get_connection()->get_priv()));
if (service.splitting(pgid)) {
waiting_for_pg[pgid].push_back(op);
@@ -6045,7 +6042,7 @@ void OSD::handle_sub_op(OpRequestRef op)
void OSD::handle_sub_op_reply(OpRequestRef op)
{
- MOSDSubOpReply *m = (MOSDSubOpReply*)op->request;
+ MOSDSubOpReply *m = static_cast<MOSDSubOpReply*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOPREPLY);
if (m->get_map_epoch() < up_epoch) {
dout(3) << "replica op reply from before up" << dendl;
@@ -6066,7 +6063,7 @@ void OSD::handle_sub_op_reply(OpRequestRef op)
// share our map with sender, if they're old
_share_map_incoming(m->get_source(), m->get_connection(), m->get_map_epoch(),
- (Session*)m->get_connection()->get_priv());
+ static_cast<Session*>(m->get_connection()->get_priv()));
PG *pg = _have_pg(pgid) ? _lookup_pg(pgid) : NULL;
if (!pg) {
@@ -6302,7 +6299,7 @@ void OSD::handle_conf_change(const struct md_config_t *conf,
int OSD::init_op_flags(OpRequestRef op)
{
- MOSDOp *m = (MOSDOp*)op->request;
+ MOSDOp *m = static_cast<MOSDOp*>(op->request);
vector<OSDOp>::iterator iter;
// client flags have no bearing on whether an op is a read, write, etc.
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index d5a0a094333..90e6c0fcd5d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2910,7 +2910,7 @@ void PG::unreg_next_scrub()
void PG::sub_op_scrub_map(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp *)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp *>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
dout(7) << "sub_op_scrub_map" << dendl;
@@ -3067,7 +3067,7 @@ void PG::_request_scrub_map(int replica, eversion_t version,
void PG::sub_op_scrub_reserve(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
dout(7) << "sub_op_scrub_reserve" << dendl;
@@ -3087,7 +3087,7 @@ void PG::sub_op_scrub_reserve(OpRequestRef op)
void PG::sub_op_scrub_reserve_reply(OpRequestRef op)
{
- MOSDSubOpReply *reply = (MOSDSubOpReply*)op->request;
+ MOSDSubOpReply *reply = static_cast<MOSDSubOpReply*>(op->request);
assert(reply->get_header().type == MSG_OSD_SUBOPREPLY);
dout(7) << "sub_op_scrub_reserve_reply" << dendl;
@@ -3132,7 +3132,7 @@ void PG::sub_op_scrub_stop(OpRequestRef op)
{
op->mark_started();
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
dout(7) << "sub_op_scrub_stop" << dendl;
@@ -4793,7 +4793,7 @@ ostream& operator<<(ostream& out, const PG& pg)
bool PG::can_discard_op(OpRequestRef op)
{
- MOSDOp *m = (MOSDOp*)op->request;
+ MOSDOp *m = static_cast<MOSDOp*>(op->request);
if (OSD::op_is_discardable(m)) {
dout(20) << " discard " << *m << dendl;
return true;
@@ -4820,7 +4820,7 @@ bool PG::can_discard_op(OpRequestRef op)
bool PG::can_discard_subop(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp *)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp *>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
// same pg?
@@ -4836,7 +4836,7 @@ bool PG::can_discard_subop(OpRequestRef op)
bool PG::can_discard_scan(OpRequestRef op)
{
- MOSDPGScan *m = (MOSDPGScan *)op->request;
+ MOSDPGScan *m = static_cast<MOSDPGScan *>(op->request);
assert(m->get_header().type == MSG_OSD_PG_SCAN);
if (old_peering_msg(m->map_epoch, m->query_epoch)) {
@@ -4848,7 +4848,7 @@ bool PG::can_discard_scan(OpRequestRef op)
bool PG::can_discard_backfill(OpRequestRef op)
{
- MOSDPGBackfill *m = (MOSDPGBackfill *)op->request;
+ MOSDPGBackfill *m = static_cast<MOSDPGBackfill *>(op->request);
assert(m->get_header().type == MSG_OSD_PG_BACKFILL);
if (old_peering_msg(m->map_epoch, m->query_epoch)) {
@@ -5208,7 +5208,6 @@ void PG::read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
// In case of sobject_t based encoding, may need to list objects in the store
// to find hashes
- bool listed_collection = false;
vector<hobject_t> ls;
if (ondisklog_head > 0) {
@@ -5228,6 +5227,8 @@ void PG::read_log_old(ObjectStore *store, coll_t coll, hobject_t log_oid,
assert(log.empty());
eversion_t last;
bool reorder = false;
+ bool listed_collection = false;
+
while (!p.end()) {
uint64_t pos = ondisklog_tail + p.get_off();
if (ondisklog_has_checksums) {
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 34acf24614a..b1f60d4f0dc 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -352,7 +352,6 @@ int ReplicatedPG::do_command(vector<string>& cmd, ostream& ss,
{
jf.open_array_section("objects");
int32_t num = 0;
- set<int> empty;
bufferlist bl;
while (p != missing.missing.end() && num < g_conf->osd_command_max_records) {
jf.open_object_section("object");
@@ -406,7 +405,7 @@ bool ReplicatedPG::pg_op_must_wait(MOSDOp *op)
void ReplicatedPG::do_pg_op(OpRequestRef op)
{
- MOSDOp *m = (MOSDOp *)op->request;
+ MOSDOp *m = static_cast<MOSDOp *>(op->request);
assert(m->get_header().type == CEPH_MSG_OSD_OP);
dout(10) << "do_pg_op " << *m << dendl;
@@ -620,7 +619,7 @@ void ReplicatedPG::get_src_oloc(const object_t& oid, const object_locator_t& olo
*/
void ReplicatedPG::do_op(OpRequestRef op)
{
- MOSDOp *m = (MOSDOp*)op->request;
+ MOSDOp *m = static_cast<MOSDOp*>(op->request);
assert(m->get_header().type == CEPH_MSG_OSD_OP);
if (op->includes_pg_op()) {
if (pg_op_must_wait(m)) {
@@ -1038,7 +1037,7 @@ void ReplicatedPG::do_op(OpRequestRef op)
void ReplicatedPG::log_op_stats(OpContext *ctx)
{
OpRequestRef op = ctx->op;
- MOSDOp *m = (MOSDOp*)op->request;
+ MOSDOp *m = static_cast<MOSDOp*>(op->request);
utime_t now = ceph_clock_now(g_ceph_context);
utime_t latency = now;
@@ -1108,7 +1107,7 @@ void ReplicatedPG::log_subop_stats(OpRequestRef op, int tag_inb, int tag_lat)
void ReplicatedPG::do_sub_op(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(require_same_or_newer_map(m->map_epoch));
assert(m->get_header().type == MSG_OSD_SUBOP);
dout(15) << "do_sub_op " << *op->request << dendl;
@@ -1157,7 +1156,7 @@ void ReplicatedPG::do_sub_op(OpRequestRef op)
void ReplicatedPG::do_sub_op_reply(OpRequestRef op)
{
- MOSDSubOpReply *r = (MOSDSubOpReply *)op->request;
+ MOSDSubOpReply *r = static_cast<MOSDSubOpReply *>(op->request);
assert(r->get_header().type == MSG_OSD_SUBOPREPLY);
if (r->ops.size() >= 1) {
OSDOp& first = r->ops[0];
@@ -1178,7 +1177,7 @@ void ReplicatedPG::do_sub_op_reply(OpRequestRef op)
void ReplicatedPG::do_scan(OpRequestRef op)
{
- MOSDPGScan *m = (MOSDPGScan*)op->request;
+ MOSDPGScan *m = static_cast<MOSDPGScan*>(op->request);
assert(m->get_header().type == MSG_OSD_PG_SCAN);
dout(10) << "do_scan " << *m << dendl;
@@ -1237,7 +1236,7 @@ void ReplicatedPG::do_scan(OpRequestRef op)
void ReplicatedPG::do_backfill(OpRequestRef op)
{
- MOSDPGBackfill *m = (MOSDPGBackfill*)op->request;
+ MOSDPGBackfill *m = static_cast<MOSDPGBackfill*>(op->request);
assert(m->get_header().type == MSG_OSD_PG_BACKFILL);
dout(10) << "do_backfill " << *m << dendl;
@@ -1788,7 +1787,6 @@ int ReplicatedPG::do_tmapup(OpContext *ctx, bufferlist::iterator& bp, OSDOp& osd
} else if (op == CEPH_OSD_TMAP_CREATE) {
if (key_exists) {
return -EEXIST;
- break;
}
bufferlist val;
try {
@@ -1897,7 +1895,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
ObjectContext *src_obc = 0;
if (ceph_osd_op_type_multi(op.op)) {
object_locator_t src_oloc;
- get_src_oloc(soid.oid, ((MOSDOp *)ctx->op->request)->get_object_locator(), src_oloc);
+ get_src_oloc(soid.oid, (static_cast<MOSDOp *>(ctx->op->request))->get_object_locator(), src_oloc);
hobject_t src_oid(osd_op.soid, src_oloc.key, soid.hash,
info.pgid.pool());
src_obc = ctx->src_obc[src_oid];
@@ -3121,7 +3119,6 @@ int ReplicatedPG::_rollback_to(OpContext *ctx, ceph_osd_op& op)
if (obs.exists)
t.remove(coll, soid);
- map<string, bufferptr> attrs;
t.clone(coll,
rollback_to_sobject, soid);
snapset.head_exists = true;
@@ -3712,7 +3709,7 @@ void ReplicatedPG::eval_repop(RepGather *repop)
{
MOSDOp *m = NULL;
if (repop->ctx->op)
- m = (MOSDOp *)repop->ctx->op->request;
+ m = static_cast<MOSDOp *>(repop->ctx->op->request);
if (m)
dout(10) << "eval_repop " << *repop
@@ -3879,7 +3876,7 @@ void ReplicatedPG::issue_repop(RepGather *repop, utime_t now,
get_osdmap()->get_epoch(),
repop->rep_tid, repop->ctx->at_version);
if (ctx->op &&
- (((MOSDOp *)ctx->op->request)->get_flags() & CEPH_OSD_FLAG_PARALLELEXEC)) {
+ ((static_cast<MOSDOp *>(ctx->op->request))->get_flags() & CEPH_OSD_FLAG_PARALLELEXEC)) {
// replicate original op for parallel execution on replica
assert(0 == "broken implementation, do not use");
wr->oloc = repop->ctx->obs->oi.oloc;
@@ -3958,7 +3955,7 @@ void ReplicatedPG::repop_ack(RepGather *repop, int result, int ack_type,
MOSDOp *m = NULL;
if (repop->ctx->op)
- m = (MOSDOp *)repop->ctx->op->request;
+ m = static_cast<MOSDOp *>(repop->ctx->op->request);
if (m)
dout(7) << "repop_ack rep_tid " << repop->rep_tid << " op " << *m
@@ -4435,7 +4432,7 @@ void ReplicatedPG::put_snapset_context(SnapSetContext *ssc)
void ReplicatedPG::sub_op_modify(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
const hobject_t& soid = m->poid;
@@ -4570,7 +4567,7 @@ void ReplicatedPG::sub_op_modify_applied(RepModify *rm)
if (!pg_has_reset_since(rm->epoch_started)) {
dout(10) << "sub_op_modify_applied on " << rm << " op " << *rm->op->request << dendl;
- MOSDSubOp *m = (MOSDSubOp*)rm->op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(rm->op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
if (!rm->committed) {
@@ -4618,7 +4615,7 @@ void ReplicatedPG::sub_op_modify_commit(RepModify *rm)
if (get_osdmap()->is_up(rm->ackerosd)) {
last_complete_ondisk = rm->last_complete;
- MOSDSubOpReply *commit = new MOSDSubOpReply((MOSDSubOp*)rm->op->request, 0, get_osdmap()->get_epoch(), CEPH_OSD_FLAG_ONDISK);
+ MOSDSubOpReply *commit = new MOSDSubOpReply(static_cast<MOSDSubOp*>(rm->op->request), 0, get_osdmap()->get_epoch(), CEPH_OSD_FLAG_ONDISK);
commit->set_last_complete_ondisk(rm->last_complete);
commit->set_priority(CEPH_MSG_PRIO_HIGH); // this better match ack priority!
osd->send_message_osd_cluster(rm->ackerosd, commit, get_osdmap()->get_epoch());
@@ -4641,7 +4638,7 @@ void ReplicatedPG::sub_op_modify_commit(RepModify *rm)
void ReplicatedPG::sub_op_modify_reply(OpRequestRef op)
{
- MOSDSubOpReply *r = (MOSDSubOpReply*)op->request;
+ MOSDSubOpReply *r = static_cast<MOSDSubOpReply*>(op->request);
assert(r->get_header().type == MSG_OSD_SUBOPREPLY);
op->mark_started();
@@ -5168,7 +5165,7 @@ ObjectRecoveryInfo ReplicatedPG::recalc_subsets(const ObjectRecoveryInfo& recove
void ReplicatedPG::handle_pull_response(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp *)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp *>(op->request);
bufferlist data;
m->claim_data(data);
interval_set<uint64_t> data_included = m->data_included;
@@ -5317,7 +5314,7 @@ void ReplicatedPG::handle_pull_response(OpRequestRef op)
void ReplicatedPG::handle_push(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp *)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp *>(op->request);
dout(10) << "handle_push "
<< m->recovery_info
<< m->recovery_progress
@@ -5505,7 +5502,7 @@ void ReplicatedPG::send_push_op_blank(const hobject_t& soid, int peer)
void ReplicatedPG::sub_op_push_reply(OpRequestRef op)
{
- MOSDSubOpReply *reply = (MOSDSubOpReply*)op->request;
+ MOSDSubOpReply *reply = static_cast<MOSDSubOpReply*>(op->request);
assert(reply->get_header().type == MSG_OSD_SUBOPREPLY);
dout(10) << "sub_op_push_reply from " << reply->get_source() << " " << *reply << dendl;
@@ -5597,7 +5594,7 @@ void ReplicatedPG::finish_degraded_object(const hobject_t& oid)
*/
void ReplicatedPG::sub_op_pull(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
op->mark_started();
@@ -5810,7 +5807,7 @@ void ReplicatedPG::sub_op_push(OpRequestRef op)
void ReplicatedPG::_failed_push(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
const hobject_t& soid = m->poid;
int from = m->get_source().num();
@@ -5834,7 +5831,7 @@ void ReplicatedPG::_failed_push(OpRequestRef op)
void ReplicatedPG::sub_op_remove(OpRequestRef op)
{
- MOSDSubOp *m = (MOSDSubOp*)op->request;
+ MOSDSubOp *m = static_cast<MOSDSubOp*>(op->request);
assert(m->get_header().type == MSG_OSD_SUBOP);
dout(7) << "sub_op_remove " << m->poid << dendl;
diff --git a/src/osd/Watch.cc b/src/osd/Watch.cc
index 1ee5f35b5e3..07650ac470c 100644
--- a/src/osd/Watch.cc
+++ b/src/osd/Watch.cc
@@ -71,7 +71,7 @@ class NotifyTimeoutCB : public CancelableContext {
NotifyRef notif;
bool canceled; // protected by notif lock
public:
- NotifyTimeoutCB(NotifyRef notif) : notif(notif) {}
+ NotifyTimeoutCB(NotifyRef notif) : notif(notif), canceled(false) {}
void finish(int) {
notif->osd->watch_lock.Unlock();
notif->lock.Lock();
View Lorry Controller Status