From: David Zafman <dzafman@redhat.com>
Date: Fri, 6 Feb 2015 02:36:01 +0000 (-0800)
Subject: osd: Fix flushing in FileJournal::dump()
X-Git-Tag: v0.94.7~28^2~11^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=288902fecd78b1926aa4a1d53587828fda63845d;p=ceph.git

osd: Fix flushing in FileJournal::dump()

Use ostream arg since caller is specifying
Move flush after last section close

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f2d83520f67fdc1b5a89b4ea742493a3df392989)
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 49f4f507a960..2c8fe7511243 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -616,10 +616,10 @@ int FileJournal::dump(ostream& out)
     }
     f.close_section();
     f.close_section();
-    f.flush(cout);
   }
 
   f.close_section();
+  f.flush(out);
   dout(10) << "dump finish" << dendl;
   return 0;
 }