osdc/Journaler: remove unused waitfor_trim

There was no code path for ever adding contexts to this list.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 4b5824f96b6c529e085b68fd70d48bab6d1d3026..521c603505d1c6ea0f8c9474fe23a22df9580509 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -1156,13 +1156,6 @@ void Journaler::_finish_trim(int r, uint64_t to)
   assert(to <= trimming_pos);
   assert(to > trimmed_pos);
   trimmed_pos = to;
-
-  // finishers?
-  while (!waitfor_trim.empty() &&
-        waitfor_trim.begin()->first <= trimmed_pos) {
-    finish_contexts(cct, waitfor_trim.begin()->second, 0);
-    waitfor_trim.erase(waitfor_trim.begin());
-  }
 }
 
 void Journaler::handle_write_error(int r)

diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h
index 3ee93343dd109a05f70dcb2a06875f026e665eb5..365cee5b2b0c94897d6b70270e0bf77c0082b7b8 100644 (file)
--- a/src/osdc/Journaler.h
+++ b/src/osdc/Journaler.h
@@ -334,7 +334,6 @@ private:
   uint64_t expire_pos;    // what we're allowed to trim to
   uint64_t trimming_pos;      // what we've requested to trim through
   uint64_t trimmed_pos;   // what has been trimmed
-  map<uint64_t, list<Context*> > waitfor_trim;
 
   void _finish_trim(int r, uint64_t to);
   class C_Trim;