From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 11 Oct 2022 14:32:02 +0000 (+0000)
Subject: crimson/osd: move ClientRequest::reply_op_error() up
X-Git-Tag: v18.1.0~336^2~2^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2aa4d8ba3e9dfb4c6d96cd8d170acb7c1ec1bcc7;p=ceph-ci.git

crimson/osd: move ClientRequest::reply_op_error() up

It's because it's return type is `auto`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index 1bf35331ebe..1d234e23ac2 100644
--- a/src/crimson/osd/osd_operations/client_request.cc
+++ b/src/crimson/osd/osd_operations/client_request.cc
@@ -194,6 +194,21 @@ ClientRequest::process_pg_op(
   });
 }
 
+auto ClientRequest::reply_op_error(const Ref<PG>& pg, int err)
+{
+  logger().debug("{}: replying with error {}", *this, err);
+  auto reply = crimson::make_message<MOSDOpReply>(
+    m.get(), err, pg->get_osdmap_epoch(),
+    m->get_flags() & (CEPH_OSD_FLAG_ACK|CEPH_OSD_FLAG_ONDISK),
+    !m->has_flag(CEPH_OSD_FLAG_RETURNVEC));
+  reply->set_reply_versions(eversion_t(), 0);
+  reply->set_op_returns(std::vector<pg_log_op_return_item_t>{});
+  return conn->send(std::move(reply)).then([] {
+    return seastar::make_ready_future<ClientRequest::seq_mode_t>
+      (seq_mode_t::OUT_OF_ORDER);
+  });
+}
+
 ClientRequest::interruptible_future<ClientRequest::seq_mode_t>
 ClientRequest::process_op(instance_handle_t &ihref, Ref<PG> &pg)
 {
@@ -253,21 +268,6 @@ ClientRequest::process_op(instance_handle_t &ihref, Ref<PG> &pg)
   }));
 }
 
-auto ClientRequest::reply_op_error(const Ref<PG>& pg, int err)
-{
-  logger().debug("{}: replying with error {}", *this, err);
-  auto reply = crimson::make_message<MOSDOpReply>(
-    m.get(), err, pg->get_osdmap_epoch(),
-    m->get_flags() & (CEPH_OSD_FLAG_ACK|CEPH_OSD_FLAG_ONDISK),
-    !m->has_flag(CEPH_OSD_FLAG_RETURNVEC));
-  reply->set_reply_versions(eversion_t(), 0);
-  reply->set_op_returns(std::vector<pg_log_op_return_item_t>{});
-  return conn->send(std::move(reply)).then([] {
-    return seastar::make_ready_future<ClientRequest::seq_mode_t>
-      (seq_mode_t::OUT_OF_ORDER);
-  });
-}
-
 ClientRequest::interruptible_future<ClientRequest::seq_mode_t>
 ClientRequest::do_process(
   instance_handle_t &ihref,