journaler: remove some dead code from read_entry()

These were used to track completion.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 172d88bbb38bbc76b65b5c410270da6212acad7a..208c964c7537dd6b91097c2e18c331356744405b 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -705,20 +705,6 @@ void Journaler::_assimilate_prefetch()
       f->finish(0);
       delete f;
     }
-
-    if (read_bl) {
-      bool r = try_read_entry(*read_bl);
-      assert(r);  // this should have worked.
-
-      // clear state
-      Context *f = on_read_finish;
-      on_read_finish = 0;
-      read_bl = 0;
-      
-      // do callback
-      f->finish(0);
-      delete f;
-    }
   }
 }
 

diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h
index 29d94a4481c47f07fbc1a9fc0cd1a329561df74f..bb78ebab60f35706c038de3040c4887826d1d9fd 100644 (file)
--- a/src/osdc/Journaler.h
+++ b/src/osdc/Journaler.h
@@ -194,9 +194,6 @@ private:
 
   int64_t junk_tail_pos; // for truncate
 
-  // for read_entry() in-progress read
-  bufferlist *read_bl;
-  Context    *on_read_finish;
   // for wait_for_readable()
   Context    *on_readable;
 
@@ -238,7 +235,7 @@ public:
     read_pos(0), requested_pos(0), received_pos(0),
     fetch_len(0), temp_fetch_len(0), prefetch_from(0),
     junk_tail_pos(0),
-    read_bl(0), on_read_finish(0), on_readable(0),
+    on_readable(0),
     expire_pos(0), trimming_pos(0), trimmed_pos(0) 
   {
   }
@@ -259,8 +256,6 @@ public:
     fetch_len = 0;
     prefetch_from = 0;
     junk_tail_pos = 0;
-    read_bl = 0;
-    on_read_finish = 0;
     assert(!on_readable);
     expire_pos = 0;
     trimming_pos = 0;
@@ -310,7 +305,6 @@ public:
   // read
   void set_read_pos(int64_t p) { 
     assert(requested_pos == received_pos);  // we can't cope w/ in-progress read right now.
-    assert(read_bl == 0); // ...
     read_pos = requested_pos = received_pos = p;
     read_buf.clear();
   }