*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@562 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/ebofs/Ebofs.cc b/ceph/ebofs/Ebofs.cc
index 691ac82a4d8a2601df1bac26aad5ce3dfca97c6d..a89d7c784a5925a6ab477008f451fbdd184d1022 100644 (file)
--- a/ceph/ebofs/Ebofs.cc
+++ b/ceph/ebofs/Ebofs.cc
@@ -200,6 +200,7 @@ int Ebofs::umount()
   finisher_stop = true;
   finisher_cond.Signal();
   finisher_lock.Unlock();
+
   finisher_thread.join();
 
   trim_bc(0);

diff --git a/ceph/osd/OSD.cc b/ceph/osd/OSD.cc
index 4243181ffc769495ffceb5585ff645974b114cc8..61a3506b66cb92a8b9e84312f8e4d70f663b0677 100644 (file)
--- a/ceph/osd/OSD.cc
+++ b/ceph/osd/OSD.cc
@@ -187,7 +187,9 @@ int OSD::shutdown()
   monitor->shutdown();
   messenger->shutdown();
 
+  osd_lock.Unlock();
   int r = store->umount();
+  osd_lock.Lock();
   return r;
 }