From: Xiubo Li <xiubli@redhat.com>
Date: Tue, 17 Oct 2023 02:04:33 +0000 (+0800)
Subject: osd: clean up the sparse-read related code
X-Git-Tag: v19.3.0~313^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bcaf7b0045974e474ebdc4a2bbb9adc0316569d;p=ceph-ci.git

osd: clean up the sparse-read related code

Just clean up the code and nothing fixed to make the code to be
more readable.

Fixes: https://tracker.ceph.com/issues/63318
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index a0919e1d87f..ac17f05035d 100644
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -568,7 +568,7 @@ typedef std::shared_ptr<const OSDMap> OSDMapRef;
 
    virtual int objects_readv_sync(
      const hobject_t &hoid,
-     std::map<uint64_t, uint64_t>&& m,
+     std::map<uint64_t, uint64_t>& m,
      uint32_t op_flags,
      ceph::buffer::list *bl) {
      return -EOPNOTSUPP;
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index c1384412a35..f548fc544e3 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -5931,7 +5931,7 @@ int PrimaryLogPG::do_sparse_read(OpContext *ctx, OSDOp& osd_op) {
     }
 
     bufferlist data_bl;
-    r = pgbackend->objects_readv_sync(soid, std::move(m), op.flags, &data_bl);
+    r = pgbackend->objects_readv_sync(soid, m, op.flags, &data_bl);
     if (r == -EIO) {
       r = rep_repair_primary_object(soid, ctx);
     }
diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index a2a3312399c..8fd2d2022f8 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -275,7 +275,7 @@ int ReplicatedBackend::objects_read_sync(
 
 int ReplicatedBackend::objects_readv_sync(
   const hobject_t &hoid,
-  map<uint64_t, uint64_t>&& m,
+  map<uint64_t, uint64_t>& m,
   uint32_t op_flags,
   bufferlist *bl)
 {
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 0800c8ab024..41b634269ba 100644
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -142,7 +142,7 @@ public:
 
   int objects_readv_sync(
     const hobject_t &hoid,
-    std::map<uint64_t, uint64_t>&& m,
+    std::map<uint64_t, uint64_t>& m,
     uint32_t op_flags,
     ceph::buffer::list *bl) override;