]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/FileStore.cc: remove identical else branch
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Fri, 1 Mar 2013 15:09:15 +0000 (16:09 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Fri, 1 Mar 2013 15:09:15 +0000 (16:09 +0100)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/os/FileStore.cc

index 674b26db1648d8eb2da54e344aee76f712f3e76c..0144a731da1788128a5cfbe42c8821b933ec0f68 100644 (file)
@@ -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();
   }