osdc: fix redundant branch

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

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 848fb5703c6e6ca6a60c5d8d57c030891d39ee35..d8bfeb5447533e26c024e920eeb0d15aebbe1333 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -1070,14 +1070,12 @@ bool JournalStream::readable(bufferlist &read_buf, uint64_t &need)
   if (read_buf.length() >= need) {
     if (format >= JOURNAL_FORMAT_RESILIENT) {
       ::decode(entry_sentinel, p);
-    }
-
-    ::decode(entry_size, p);
-    if (format >= JOURNAL_FORMAT_RESILIENT) {
       if (entry_sentinel != sentinel) {
         throw buffer::malformed_input("Invalid sentinel"); 
       }
     }
+
+    ::decode(entry_size, p);
   } else {
     return false;
   }