CephContext: unregister lockdep after stopping service thread

Fixes: ceph#6769 Fixes: ceph#6674 Signed-off-by: Samuel Just <[email protected]> Reviewed-by: Josh Durgin <[email protected]>
dragonylffly · Nov 14, 2013 · 1212a21 · 1212a21
1 parent dd9d8b0
commit 1212a21
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
@@ -292,12 +292,12 @@ CephContext::CephContext(uint32_t module_type_)
 
 CephContext::~CephContext()
 {
+  join_service_thread();
+
   if (_conf->lockdep) {
     lockdep_unregister_ceph_context(this);
   }
 
-  join_service_thread();
-
   _admin_socket->unregister_command("perfcounters_dump");
   _admin_socket->unregister_command("perf dump");
   _admin_socket->unregister_command("1");