From: Kefu Chai <kchai@redhat.com>
Date: Thu, 13 May 2021 06:21:48 +0000 (+0800)
Subject: crimson/osd: construct future state in-place
X-Git-Tag: v17.1.0~1977^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cad60b4b3b6df8e0003e38d646d7a1fd297ff7dd;p=ceph.git

crimson/osd: construct future state in-place

instead of constructing the value of state, pass the parameters for
building it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc
index cf030cbe87d..98f62b337d3 100644
--- a/src/crimson/osd/ops_executer.cc
+++ b/src/crimson/osd/ops_executer.cc
@@ -662,7 +662,7 @@ static PG::interruptible_future<hobject_t> pgls_filter(
         logger().debug("pgls_filter: got error for obj={}", sobj);
 
         if (filter.reject_empty_xattr()) {
-          return seastar::make_ready_future<hobject_t>(hobject_t{});
+          return seastar::make_ready_future<hobject_t>();
         }
         ceph::bufferlist val;
         const bool filtered = filter.filter(sobj, val);
@@ -733,7 +733,7 @@ static PG::interruptible_future<ceph::bufferlist> do_pgnls_common(
           logger().debug("do_pgnls_common: 1st done");
           return seastar::make_ready_future<
             std::tuple<std::vector<hobject_t>, hobject_t>>(
-              std::make_tuple(std::move(items), std::move(next)));
+              std::move(items), std::move(next));
       });
   }).then_interruptible(
     [pg_end] (auto&& ret) {
@@ -862,7 +862,7 @@ static PG::interruptible_future<ceph::bufferlist> do_pgls_common(
                 return seastar::make_ready_future<hobject_t>(obj);
               }
             } else {
-              return seastar::make_ready_future<hobject_t>(hobject_t{});
+              return seastar::make_ready_future<hobject_t>();
             }
           },
           entries_t{},