os/FileStore: use derr/dendl for dout locking

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 6aa4b3200431e0b191ff928593380d4391d5c3ef..3f4528004e6c0ca33ab8cb0ef1c60b731ab606c7 100644 (file)
--- 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();
   }