From a7b8e9c613ffe12e8d9ee73aee6b671511322c16 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Mon, 14 Feb 2011 04:06:54 -0800
Subject: [PATCH] os/FileStore: use derr/dendl for dout locking

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 src/os/FileStore.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 6aa4b3200431..3f4528004e6c 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2470,12 +2470,10 @@ public:
 
   void finish(int r) {
     BackTrace *bt = new BackTrace(1);
-    _dout_lock.Lock();
-    *_dout << "FileStore: sync_entry timed out after "
+    generic_dout(-1) << "FileStore: sync_entry timed out after "
 	   << g_conf.filestore_commit_timeout << " seconds.\n";
     bt->print(*_dout);
-    _dout_lock.Unlock();
-    _dout->flush();
+    *_dout << dendl;
     delete bt;
     ceph_abort();
   }
-- 
2.47.3