import 15.2.0 Octopus source

[ceph.git] / ceph / src / rgw / librgw_admin_user.cc

diff --git a/ceph/src/rgw/librgw_admin_user.cc b/ceph/src/rgw/librgw_admin_user.cc
index 928f04cb3294f711de7b9694f098b4642071671e..2c1f0ae2c705f9005dffb5496f45c4cad28bf941 100644 (file)
--- a/ceph/src/rgw/librgw_admin_user.cc
+++ b/ceph/src/rgw/librgw_admin_user.cc
@@ -1,5 +1,5 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// vim: ts=8 sw=2 smarttab ft=cpp
 
 /*
  * create rgw admin user
@@ -89,33 +89,31 @@ namespace rgw {
                      CEPH_ENTITY_TYPE_CLIENT,
                      CODE_ENVIRONMENT_UTILITY, 0);
 
-    Mutex mutex("main");
+    ceph::mutex mutex = ceph::make_mutex("main");
     SafeTimer init_timer(g_ceph_context, mutex);
     init_timer.init();
-    mutex.Lock();
+    mutex.lock();
     init_timer.add_event_after(g_conf()->rgw_init_timeout, new C_InitTimeout);
-    mutex.Unlock();
+    mutex.unlock();
 
     common_init_finish(g_ceph_context);
 
     store = RGWStoreManager::get_storage(g_ceph_context, false, false, false, false, false);
 
     if (!store) {
-      mutex.Lock();
+      mutex.lock();
       init_timer.cancel_all_events();
       init_timer.shutdown();
-      mutex.Unlock();
+      mutex.unlock();
 
       derr << "Couldn't init storage provider (RADOS)" << dendl;
       return -EIO;
     }
 
-    mutex.Lock();
+    mutex.lock();
     init_timer.cancel_all_events();
     init_timer.shutdown();
-    mutex.Unlock();
-
-    rgw_user_init(store);
+    mutex.unlock();
 
     init_async_signal_handler();
     register_async_signal_handler(SIGUSR1, handle_sigterm);