update sources to 12.2.8

[ceph.git] / ceph / src / ceph_mon.cc

diff --git a/ceph/src/ceph_mon.cc b/ceph/src/ceph_mon.cc
index 41a6ee0eb10a4b246d6f2df8eed6d862165b99a7..c1d0b041fedb84e61b79cb92c6374b0e19c9dd1a 100644 (file)
--- a/ceph/src/ceph_mon.cc
+++ b/ceph/src/ceph_mon.cc
@@ -181,12 +181,7 @@ static void usage()
   generic_server_usage();
 }
 
-#ifdef BUILDING_FOR_EMBEDDED
-void cephd_preload_embedded_plugins();
-extern "C" int cephd_mon(int argc, const char **argv)
-#else
 int main(int argc, const char **argv)
-#endif
 {
   int err;
 
@@ -475,7 +470,7 @@ int main(int argc, const char **argv)
     if (stats.avail_percent <= g_conf->mon_data_avail_crit) {
       derr << "error: monitor data filesystem reached concerning levels of"
            << " available storage space (available: "
-           << stats.avail_percent << "% " << prettybyte_t(stats.byte_avail)
+           << stats.avail_percent << "% " << byte_u_t(stats.byte_avail)
            << ")\nyou may adjust 'mon data avail crit' to a lower value"
            << " to make this go away (default: " << g_conf->mon_data_avail_crit
            << "%)\n" << dendl;
@@ -505,12 +500,8 @@ int main(int argc, const char **argv)
     }
     common_init_finish(g_ceph_context);
     global_init_chdir(g_ceph_context);
-#ifndef BUILDING_FOR_EMBEDDED
     if (global_init_preload_erasure_code(g_ceph_context) < 0)
       prefork.exit(1);
-#else
-    cephd_preload_embedded_plugins();
-#endif
   }
 
   MonitorDBStore *store = new MonitorDBStore(g_conf->mon_data);