From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 1 Mar 2013 15:09:15 +0000 (+0100)
Subject: os/FileStore.cc: remove identical else branch
X-Git-Tag: v0.59~54^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40aaf821b1430b83c0645efe19c43575f88a52a0;p=ceph.git

os/FileStore.cc: remove identical else branch

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 674b26db1648..0144a731da17 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -3610,10 +3610,8 @@ void FileStore::sync_and_flush()
     if (journal)
       journal->flush();
     _flush_op_queue();
-  } else if (m_filestore_journal_parallel) {
-    _flush_op_queue();
-    sync();
   } else {
+    // includes m_filestore_journal_parallel
     _flush_op_queue();
     sync();
   }