From: Samuel Just <sjust@redhat.com>
Date: Wed, 12 Aug 2020 18:10:56 +0000 (-0700)
Subject: crimson/os/seastore: remove CachedExtent move constructor
X-Git-Tag: v16.1.0~983^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7670fccc4246cd915e31e65a32c29954eb743cad;p=ceph.git

crimson/os/seastore: remove CachedExtent move constructor

I'm not sure why I added this in the first place, there aren't really
any scenarios where invoking it wouldn't be a bug.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h
index e242d174996..c5fedf2adaf 100644
--- a/src/crimson/os/seastore/cached_extent.h
+++ b/src/crimson/os/seastore/cached_extent.h
@@ -313,7 +313,7 @@ private:
   }
 
 protected:
-  CachedExtent(CachedExtent &&other) = default;
+  CachedExtent(CachedExtent &&other) = delete;
   CachedExtent(ceph::bufferptr &&ptr) : ptr(std::move(ptr)) {}
   CachedExtent(const CachedExtent &other)
     : state(other.state),
diff --git a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h
index 892388be0c4..9f53bef8105 100644
--- a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h
+++ b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h
@@ -15,10 +15,7 @@ struct OnodeBlock final : LogicalCachedExtent {
 
   template <typename... T>
   OnodeBlock(T&&... t) : LogicalCachedExtent(std::forward<T>(t)...) {}
-  OnodeBlock(OnodeBlock&& block) noexcept
-    : LogicalCachedExtent{std::move(block)},
-      deltas{std::move(block.deltas)}
-  {}
+  OnodeBlock(OnodeBlock&& block) = delete;
   OnodeBlock(const OnodeBlock& block, CachedExtent::share_buffer_t tag) noexcept
     : LogicalCachedExtent{block, tag},
       share_buffer{true}