From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Aug 2014 19:56:39 +0000 (-0700)
Subject: Revert "os/FileJournal: Update the journal header when closing journal"
X-Git-Tag: v0.84~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93c5b25be87ecdf5d6a8e7c8adf20da3f9560eed;p=ceph.git

Revert "os/FileJournal: Update the journal header when closing journal"

This reverts commit 4eb18dd487da4cb621dcbecfc475fc0871b356ac.

This may be responsible for #9073.  Until that is resolved, revert.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 5649e6da6050..7eb7927e0412 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -544,7 +544,6 @@ void FileJournal::close()
 
   // close
   assert(writeq_empty());
-  assert(!must_write_header);
   assert(fd >= 0);
   VOID_TEMP_FAILURE_RETRY(::close(fd));
   fd = -1;
@@ -1103,7 +1102,7 @@ void FileJournal::write_thread_entry()
   while (1) {
     {
       Mutex::Locker locker(writeq_lock);
-      if (writeq.empty() && !must_write_header) {
+      if (writeq.empty()) {
 	if (write_stop)
 	  break;
 	dout(20) << "write_thread_entry going to sleep" << dendl;