]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/osd: use the alias for OpsExecuter in PG::do_osd_ops().
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 18 Mar 2021 08:58:56 +0000 (08:58 +0000)
committerKefu Chai <kchai@redhat.com>
Fri, 2 Apr 2021 07:24:43 +0000 (15:24 +0800)
It's already defined there. We've just missed this fact in
one place.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/osd/pg.cc

index afe182cb649e0af2bf634981143fc43d410c51e5..10a7a4f5520c4a22daa6dc79b2ad95f3342e825a 100644 (file)
@@ -708,8 +708,8 @@ PG::do_osd_ops(
     throw crimson::common::system_shutdown_exception();
   }
 
-  using osd_op_ierrorator =
-    OpsExecuter::osd_op_ierrorator;
+  using osd_op_ierrorator = OpsExecuter::osd_op_ierrorator;
+  using osd_op_errorator = OpsExecuter::osd_op_errorator;
   const auto oid = m->get_snapid() == CEPH_SNAPDIR ? m->get_hobj().get_head()
                                                    : m->get_hobj();
   auto ox = std::make_unique<OpsExecuter>(
@@ -769,10 +769,10 @@ PG::do_osd_ops(
       return PG::do_osd_ops_ertr::future<Ref<MOSDOpReply>>(
       crimson::ct_error::eagain::make());
     });
-  }), OpsExecuter::osd_op_errorator::all_same_way([ox = std::move(ox),
-                                     m,
-                                     obc,
-                                     this] (const std::error_code& e) {
+  }), osd_op_errorator::all_same_way([ox = std::move(ox),
+                                      m,
+                                      obc,
+                                      this] (const std::error_code& e) {
     return handle_failed_op(e, std::move(obc), *ox, *m);
   }));
 }