summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Dachary <loic@dachary.org>2013-08-15 19:42:13 +0200
committerLoic Dachary <loic@dachary.org>2013-08-22 02:10:58 +0200
commite1be37a37574b67f57cb653f4dab8880798cc089 (patch)
tree589f0822e0ef04b1475661d5b56491aa3edafeaf
parentbe04918d4446a7e4ab997e255db6448db749c2a5 (diff)
downloadceph-e1be37a37574b67f57cb653f4dab8880798cc089.tar.gz
PG: remove unused PG::_cond
http://tracker.ceph.com/issues/5510 refs #5510 Signed-off-by: Loic Dachary <loic@dachary.org>
-rw-r--r--src/osd/OSD.cc1
-rw-r--r--src/osd/PG.cc3
-rw-r--r--src/osd/PG.h9
-rw-r--r--src/osd/ReplicatedPG.cc3
4 files changed, 0 insertions, 16 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 55f11707189..9a58289eda4 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1522,7 +1522,6 @@ int OSD::shutdown()
dout(20) << " kicking pg " << p->first << dendl;
p->second->lock();
p->second->on_shutdown();
- p->second->kick();
p->second->unlock();
p->second->osr->flush();
}
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 49ea61a603a..cd5621cddf2 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4527,9 +4527,6 @@ void PG::start_peering_interval(const OSDMapRef lastmap,
{
const OSDMapRef osdmap = get_osdmap();
- // -- there was a change! --
- kick();
-
set_last_peering_reset();
vector<int> oldacting, oldup;
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 14ac7c9fac5..720ce67bca3 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -232,7 +232,6 @@ protected:
* put_unlock() when done with the current pointer (_most common_).
*/
Mutex _lock;
- Cond _cond;
atomic_t ref;
#ifdef PG_DEBUG_REFS
@@ -261,14 +260,6 @@ public:
bool is_locked() const {
return _lock.is_locked();
}
- void wait() {
- assert(_lock.is_locked());
- _cond.Wait(_lock);
- }
- void kick() {
- assert(_lock.is_locked());
- _cond.Signal();
- }
#ifdef PG_DEBUG_REFS
uint64_t get_with_id();
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 6c7ec56af88..29fc5f8d6cb 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4739,9 +4739,6 @@ void ReplicatedPG::put_object_context(ObjectContext *obc)
if (obc->registered)
object_contexts.erase(obc->obs.oi.soid);
delete obc;
-
- if (object_contexts.empty())
- kick();
}
}