Revert "Merge pull request #16715 from adamemerson/wip-I-Object!"

This reverts commit 669453138d89e0f797a1bd37f38a2d68e6aac366, reversing
changes made to 36f5fcbb97eb2b1bceb526331eb3464f460fc701.

Signed-off-by: Sage Weil <sage@redhat.com>

- conflicts due to code rearrangement in 14b0db908f652032c358e419ffa90f5676698d0e

1 files changed, 2 insertions, 8 deletions

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 4f889328f95..5ac18116f12 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -16,9 +16,7 @@
 #include <sys/utsname.h>
 #include <iostream>
 #include <string>
-#include <optional>
 
-#include "common/async/context_pool.h"
 #include "common/config.h"
 #include "common/errno.h"
 
@@ -46,8 +44,6 @@
 
 #define dout_context g_ceph_context
 
-ceph::async::io_context_pool icp;
-
 static void fuse_usage()
 {
   const char* argv[] = {
@@ -227,8 +223,7 @@ int main(int argc, const char **argv, const char *envp[]) {
     int tester_r = 0;
     void *tester_rp = nullptr;
 
-    icp.start(cct->_conf.get_val<std::uint64_t>("client_asio_thread_count"));
-    MonClient *mc = new MonClient(g_ceph_context, icp);
+    MonClient *mc = new MonClient(g_ceph_context);
     int r = mc->build_initial_monmap();
     if (r == -EINVAL) {
       cerr << "failed to generate initial mon list" << std::endl;
@@ -243,7 +238,7 @@ int main(int argc, const char **argv, const char *envp[]) {
     messenger->set_policy(entity_name_t::TYPE_MDS,
 			  Messenger::Policy::lossless_client(0));
 
-    client = new StandaloneClient(messenger, mc, icp);
+    client = new StandaloneClient(messenger, mc);
     if (filer_flags) {
       client->set_filer_flags(filer_flags);
     }
@@ -310,7 +305,6 @@ int main(int argc, const char **argv, const char *envp[]) {
     client->unmount();
     cfuse->finalize();
   out_shutdown:
-    icp.stop();
     client->shutdown();
   out_init_failed:
     unregister_async_signal_handler(SIGHUP, sighup_handler);