From: Danny Al-Gaaf Date: Thu, 8 May 2014 08:09:25 +0000 (+0200) Subject: remove superfluous second semicolons at end of lines X-Git-Tag: v0.81~45^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4b79ebbecc2f20f4f77249d865d4cb417efce07;p=ceph.git remove superfluous second semicolons at end of lines Signed-off-by: Danny Al-Gaaf --- diff --git a/fusetrace/fusetrace_ll.cc b/fusetrace/fusetrace_ll.cc index a60a14ca6c18..4c8eb0d2fd55 100644 --- a/fusetrace/fusetrace_ll.cc +++ b/fusetrace/fusetrace_ll.cc @@ -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 << ino << endl << fi->flags << endl - << (fd > 0 ? fd:0) << endl;; + << (fd > 0 ? fd:0) << endl; trace_lock.Unlock(); if (res == 0) { diff --git a/src/client/Client.cc b/src/client/Client.cc index 6e46d6da7512..19b9c1538619 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -3943,7 +3943,7 @@ int Client::mount(const std::string &mount_root) Mutex::Locker lock(client_lock); if (mounted) { - ldout(cct, 5) << "already mounted" << dendl;; + ldout(cct, 5) << "already mounted" << dendl; return 0; } diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc index fbf24c94516b..35c995dae946 100644 --- a/src/mds/MDBalancer.cc +++ b/src/mds/MDBalancer.cc @@ -551,7 +551,7 @@ void MDBalancer::prep_rebalance(int beat) if (maxim <= .001) continue; try_match(ex->second, maxex, im->first, maxim); - if (maxex <= .001) break;; + if (maxex <= .001) break; } } } diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index ba57b0e4bdd5..2625f4b5fe6c 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -2651,7 +2651,7 @@ void MDCache::handle_mds_failure(int who) for (ceph::unordered_map::iterator p = active_requests.begin(); p != active_requests.end(); ++p) { - MDRequestRef& mdr = p->second;; + MDRequestRef& mdr = p->second; // slave to the failed node? if (mdr->slave_to_mds == who) { if (mdr->slave_did_prepare()) { diff --git a/src/mds/Server.cc b/src/mds/Server.cc index c8a3ebc50cfe..b634654fd448 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -3102,7 +3102,7 @@ void Server::handle_client_file_setlock(MDRequestRef& mdr) 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) { list activated_locks; list waiters; diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 3a6dda46a923..b9027164c772 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -427,7 +427,7 @@ int MonClient::authenticate(double timeout) Mutex::Locker lock(monc_lock); if (state == MC_STATE_HAVE_SESSION) { - ldout(cct, 5) << "already authenticated" << dendl;; + ldout(cct, 5) << "already authenticated" << dendl; return 0; } diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index c3ba4db4eddc..8e58ae78ff51 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -1387,7 +1387,7 @@ int FileStore::mount() stringstream err2; if (g_conf->filestore_debug_omap_check && !dbomap->check(err2)) { - derr << err2.str() << dendl;; + derr << err2.str() << dendl; delete dbomap; ret = -EINVAL; goto close_current_fd; @@ -1477,7 +1477,7 @@ int FileStore::mount() { stringstream err2; if (g_conf->filestore_debug_omap_check && !object_map->check(err2)) { - derr << err2.str() << dendl;; + derr << err2.str() << dendl; ret = -EINVAL; goto close_current_fd; } diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc index ebcd13cb24e6..4bd9b5fe4dde 100644 --- a/src/os/KeyValueStore.cc +++ b/src/os/KeyValueStore.cc @@ -867,7 +867,7 @@ int KeyValueStore::mount() stringstream err2; if (g_conf->keyvaluestore_debug_check_backend && !dbomap->check(err2)) { - derr << err2.str() << dendl;; + derr << err2.str() << dendl; delete dbomap; ret = -EINVAL; goto close_current_fd; diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 64d6e45ea2eb..3e237c32f80b 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -434,7 +434,7 @@ bool PG::MissingLoc::add_source_info( const pg_info_t &oinfo, const pg_missing_t &omissing) { - bool found_missing = false;; + bool found_missing = false; // found items? for (map::const_iterator p = needs_recovery_map.begin(); p != needs_recovery_map.end(); diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index be71d6fcdd7f..5bf24cc606d8 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1851,7 +1851,7 @@ void ReplicatedPG::execute_ctx(OpContext *ctx) } else { dout(20) << " op order client." << n << " tid " << t << " last was " << p->second << dendl; 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"); } p->second = t; @@ -4780,7 +4780,7 @@ void ReplicatedPG::make_writeable(OpContext *ctx) // clone? assert(soid.snap == CEPH_NOSNAP); dout(20) << "make_writeable " << soid << " snapset=" << ctx->snapset - << " snapc=" << snapc << dendl;; + << " snapc=" << snapc << dendl; bool was_dirty = ctx->obc->obs.oi.is_dirty(); if (ctx->new_obs.exists) { diff --git a/src/rgw/rgw_cors_s3.cc b/src/rgw/rgw_cors_s3.cc index 01150a9e65b6..03a452364d2d 100644 --- a/src/rgw/rgw_cors_s3.cc +++ b/src/rgw/rgw_cors_s3.cc @@ -31,7 +31,7 @@ void RGWCORSRule_S3::to_xml(XMLFormatter& f) { f.open_object_section("CORSRule"); /*ID if present*/ if (id.length() > 0) { - f.dump_string("ID", id);; + f.dump_string("ID", id); } /*AllowedMethods*/ if (allowed_methods & RGW_CORS_GET) diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc index eecd9ea4cf1e..22c029fd3782 100644 --- a/src/test/ObjectMap/test_object_map.cc +++ b/src/test/ObjectMap/test_object_map.cc @@ -533,7 +533,7 @@ public: string strpath(path); - cerr << "using path " << strpath << std::endl;; + cerr << "using path " << strpath << std::endl; LevelDBStore *store = new LevelDBStore(g_ceph_context, strpath); assert(!store->create_and_open(cerr)); diff --git a/src/test/osdc/FakeWriteback.cc b/src/test/osdc/FakeWriteback.cc index 7c678cf43d8b..42567cbe21f9 100644 --- a/src/test/osdc/FakeWriteback.cc +++ b/src/test/osdc/FakeWriteback.cc @@ -76,7 +76,7 @@ ceph_tid_t FakeWriteback::write(const object_t& oid, uint64_t trunc_size, __u32 trunc_seq, 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); return m_tid.inc(); }