From: John Spray <john.spray@inktank.com>
Date: Thu, 1 May 2014 11:58:48 +0000 (+0100)
Subject: osdc: fix redundant branch
X-Git-Tag: v0.82~48^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=405cb8572d6dc7e4b1b6b602b1f0285e3f27db73;p=ceph.git

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 848fb5703c6e..d8bfeb544753 100644
--- 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;
   }