Skip to content

Commit

Permalink
remove superfluous second semicolons at end of lines
Browse files Browse the repository at this point in the history
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
  • Loading branch information
dalgaaf committed May 8, 2014
1 parent 1214257 commit b4b79eb
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion fusetrace/fusetrace_ll.cc
Expand Up @@ -976,7 +976,7 @@ static void ft_ll_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi
traceout << "ll_open" << endl traceout << "ll_open" << endl
<< ino << endl << ino << endl
<< fi->flags << endl << fi->flags << endl
<< (fd > 0 ? fd:0) << endl;; << (fd > 0 ? fd:0) << endl;
trace_lock.Unlock(); trace_lock.Unlock();


if (res == 0) { if (res == 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/client/Client.cc
Expand Up @@ -3943,7 +3943,7 @@ int Client::mount(const std::string &mount_root)
Mutex::Locker lock(client_lock); Mutex::Locker lock(client_lock);


if (mounted) { if (mounted) {
ldout(cct, 5) << "already mounted" << dendl;; ldout(cct, 5) << "already mounted" << dendl;
return 0; return 0;
} }


Expand Down
2 changes: 1 addition & 1 deletion src/mds/MDBalancer.cc
Expand Up @@ -551,7 +551,7 @@ void MDBalancer::prep_rebalance(int beat)
if (maxim <= .001) continue; if (maxim <= .001) continue;
try_match(ex->second, maxex, try_match(ex->second, maxex,
im->first, maxim); im->first, maxim);
if (maxex <= .001) break;; if (maxex <= .001) break;
} }
} }
} }
Expand Down
2 changes: 1 addition & 1 deletion src/mds/MDCache.cc
Expand Up @@ -2651,7 +2651,7 @@ void MDCache::handle_mds_failure(int who)
for (ceph::unordered_map<metareqid_t, MDRequestRef>::iterator p = active_requests.begin(); for (ceph::unordered_map<metareqid_t, MDRequestRef>::iterator p = active_requests.begin();
p != active_requests.end(); p != active_requests.end();
++p) { ++p) {
MDRequestRef& mdr = p->second;; MDRequestRef& mdr = p->second;
// slave to the failed node? // slave to the failed node?
if (mdr->slave_to_mds == who) { if (mdr->slave_to_mds == who) {
if (mdr->slave_did_prepare()) { if (mdr->slave_did_prepare()) {
Expand Down
2 changes: 1 addition & 1 deletion src/mds/Server.cc
Expand Up @@ -3102,7 +3102,7 @@ void Server::handle_client_file_setlock(MDRequestRef& mdr)
return; return;
} }


dout(10) << " state prior to lock change: " << *lock_state << dendl;; dout(10) << " state prior to lock change: " << *lock_state << dendl;
if (CEPH_LOCK_UNLOCK == set_lock.type) { if (CEPH_LOCK_UNLOCK == set_lock.type) {
list<ceph_filelock> activated_locks; list<ceph_filelock> activated_locks;
list<Context*> waiters; list<Context*> waiters;
Expand Down
2 changes: 1 addition & 1 deletion src/mon/MonClient.cc
Expand Up @@ -427,7 +427,7 @@ int MonClient::authenticate(double timeout)
Mutex::Locker lock(monc_lock); Mutex::Locker lock(monc_lock);


if (state == MC_STATE_HAVE_SESSION) { if (state == MC_STATE_HAVE_SESSION) {
ldout(cct, 5) << "already authenticated" << dendl;; ldout(cct, 5) << "already authenticated" << dendl;
return 0; return 0;
} }


Expand Down
4 changes: 2 additions & 2 deletions src/os/FileStore.cc
Expand Up @@ -1387,7 +1387,7 @@ int FileStore::mount()
stringstream err2; stringstream err2;


if (g_conf->filestore_debug_omap_check && !dbomap->check(err2)) { if (g_conf->filestore_debug_omap_check && !dbomap->check(err2)) {
derr << err2.str() << dendl;; derr << err2.str() << dendl;
delete dbomap; delete dbomap;
ret = -EINVAL; ret = -EINVAL;
goto close_current_fd; goto close_current_fd;
Expand Down Expand Up @@ -1477,7 +1477,7 @@ int FileStore::mount()
{ {
stringstream err2; stringstream err2;
if (g_conf->filestore_debug_omap_check && !object_map->check(err2)) { if (g_conf->filestore_debug_omap_check && !object_map->check(err2)) {
derr << err2.str() << dendl;; derr << err2.str() << dendl;
ret = -EINVAL; ret = -EINVAL;
goto close_current_fd; goto close_current_fd;
} }
Expand Down
2 changes: 1 addition & 1 deletion src/os/KeyValueStore.cc
Expand Up @@ -867,7 +867,7 @@ int KeyValueStore::mount()
stringstream err2; stringstream err2;


if (g_conf->keyvaluestore_debug_check_backend && !dbomap->check(err2)) { if (g_conf->keyvaluestore_debug_check_backend && !dbomap->check(err2)) {
derr << err2.str() << dendl;; derr << err2.str() << dendl;
delete dbomap; delete dbomap;
ret = -EINVAL; ret = -EINVAL;
goto close_current_fd; goto close_current_fd;
Expand Down
2 changes: 1 addition & 1 deletion src/osd/PG.cc
Expand Up @@ -434,7 +434,7 @@ bool PG::MissingLoc::add_source_info(
const pg_info_t &oinfo, const pg_info_t &oinfo,
const pg_missing_t &omissing) const pg_missing_t &omissing)
{ {
bool found_missing = false;; bool found_missing = false;
// found items? // found items?
for (map<hobject_t,pg_missing_t::item>::const_iterator p = needs_recovery_map.begin(); for (map<hobject_t,pg_missing_t::item>::const_iterator p = needs_recovery_map.begin();
p != needs_recovery_map.end(); p != needs_recovery_map.end();
Expand Down
4 changes: 2 additions & 2 deletions src/osd/ReplicatedPG.cc
Expand Up @@ -1851,7 +1851,7 @@ void ReplicatedPG::execute_ctx(OpContext *ctx)
} else { } else {
dout(20) << " op order client." << n << " tid " << t << " last was " << p->second << dendl; dout(20) << " op order client." << n << " tid " << t << " last was " << p->second << dendl;
if (p->second > t) { if (p->second > t) {
derr << "bad op order, already applied " << p->second << " > this " << t << dendl;; derr << "bad op order, already applied " << p->second << " > this " << t << dendl;
assert(0 == "out of order op"); assert(0 == "out of order op");
} }
p->second = t; p->second = t;
Expand Down Expand Up @@ -4780,7 +4780,7 @@ void ReplicatedPG::make_writeable(OpContext *ctx)
// clone? // clone?
assert(soid.snap == CEPH_NOSNAP); assert(soid.snap == CEPH_NOSNAP);
dout(20) << "make_writeable " << soid << " snapset=" << ctx->snapset dout(20) << "make_writeable " << soid << " snapset=" << ctx->snapset
<< " snapc=" << snapc << dendl;; << " snapc=" << snapc << dendl;


bool was_dirty = ctx->obc->obs.oi.is_dirty(); bool was_dirty = ctx->obc->obs.oi.is_dirty();
if (ctx->new_obs.exists) { if (ctx->new_obs.exists) {
Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_cors_s3.cc
Expand Up @@ -31,7 +31,7 @@ void RGWCORSRule_S3::to_xml(XMLFormatter& f) {
f.open_object_section("CORSRule"); f.open_object_section("CORSRule");
/*ID if present*/ /*ID if present*/
if (id.length() > 0) { if (id.length() > 0) {
f.dump_string("ID", id);; f.dump_string("ID", id);
} }
/*AllowedMethods*/ /*AllowedMethods*/
if (allowed_methods & RGW_CORS_GET) if (allowed_methods & RGW_CORS_GET)
Expand Down
2 changes: 1 addition & 1 deletion src/test/ObjectMap/test_object_map.cc
Expand Up @@ -533,7 +533,7 @@ class ObjectMapTest : public ::testing::Test {


string strpath(path); string strpath(path);


cerr << "using path " << strpath << std::endl;; cerr << "using path " << strpath << std::endl;
LevelDBStore *store = new LevelDBStore(g_ceph_context, strpath); LevelDBStore *store = new LevelDBStore(g_ceph_context, strpath);
assert(!store->create_and_open(cerr)); assert(!store->create_and_open(cerr));


Expand Down
2 changes: 1 addition & 1 deletion src/test/osdc/FakeWriteback.cc
Expand Up @@ -76,7 +76,7 @@ ceph_tid_t FakeWriteback::write(const object_t& oid,
uint64_t trunc_size, __u32 trunc_seq, uint64_t trunc_size, __u32 trunc_seq,
Context *oncommit) Context *oncommit)
{ {
C_Delay *wrapper = new C_Delay(m_cct, oncommit, m_lock, off, NULL, m_delay_ns);; C_Delay *wrapper = new C_Delay(m_cct, oncommit, m_lock, off, NULL, m_delay_ns);
m_finisher->queue(wrapper, 0); m_finisher->queue(wrapper, 0);
return m_tid.inc(); return m_tid.inc();
} }
Expand Down

0 comments on commit b4b79eb

Please sign in to comment.