From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 26 Apr 2019 13:33:05 +0000 (+0200)
Subject: crimson: PG::do_osd_op() takes OSDOp by reference, not pointer.
X-Git-Tag: v15.1.0~2730^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0bfcde95e82787b4f308caf3ea8b3a1495824120;p=ceph-ci.git

crimson: PG::do_osd_op() takes OSDOp by reference, not pointer.

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

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 9bba0946609..b7f41ccfd3a 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -969,9 +969,9 @@ seastar::future<> PG::wait_for_active()
 }
 
 seastar::future<>
-PG::do_osd_op(const object_info_t& oi, OSDOp* osd_op)
+PG::do_osd_op(const object_info_t& oi, OSDOp& osd_op)
 {
-  switch (const auto& op = osd_op->op; op.op) {
+  switch (const auto& op = osd_op.op; op.op) {
   case CEPH_OSD_OP_SYNC_READ:
     [[fallthrough]];
   case CEPH_OSD_OP_READ:
@@ -980,9 +980,9 @@ PG::do_osd_op(const object_info_t& oi, OSDOp* osd_op)
                          op.extent.length,
                          op.extent.truncate_size,
                          op.extent.truncate_seq,
-                         op.flags).then([osd_op](bufferlist bl) {
-      osd_op->rval = bl.length();
-      osd_op->outdata = std::move(bl);
+                         op.flags).then([&osd_op](bufferlist bl) {
+      osd_op.rval = bl.length();
+      osd_op.outdata = std::move(bl);
       return seastar::now();
     });
   default:
@@ -1002,7 +1002,7 @@ seastar::future<Ref<MOSDOpReply>> PG::do_osd_ops(Ref<MOSDOp> m)
                         m->get_hobj().get_head() :
                         m->get_hobj());
       return backend->get_object(oid).then([&osd_op,this](auto oi) {
-        return do_osd_op(*oi, &osd_op);
+        return do_osd_op(*oi, osd_op);
       }).handle_exception_type([&osd_op](const object_not_found&) {
         osd_op.rval = -ENOENT;
         throw;
diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 180b13dac5f..b83d8a81585 100644
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -128,7 +128,7 @@ private:
 			    const std::vector<int>& new_acting,
 			    int new_acting_primary);
   seastar::future<Ref<MOSDOpReply>> do_osd_ops(Ref<MOSDOp> m);
-  seastar::future<> do_osd_op(const object_info_t& oi, OSDOp* op);
+  seastar::future<> do_osd_op(const object_info_t& oi, OSDOp& op);
 
 private:
   const spg_t pgid;