From: Samuel Just <sjust@redhat.com>
Date: Wed, 22 Jul 2020 19:23:36 +0000 (-0700)
Subject: crimson/os/seastore: factor out LogicalCachedExtent::on_delta_write
X-Git-Tag: v16.1.0~983^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=053f4017d1b317169aa81af05b6ee40ad9491b93;p=ceph.git

crimson/os/seastore: factor out LogicalCachedExtent::on_delta_write

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 c5fedf2adafb..d03578caa44e 100644
--- a/src/crimson/os/seastore/cached_extent.h
+++ b/src/crimson/os/seastore/cached_extent.h
@@ -575,6 +575,12 @@ protected:
     return out;
   }
 
+  virtual void logical_on_delta_write() {}
+
+  void on_delta_write(paddr_t record_block_offset) final {
+    logical_on_delta_write();
+  }
+
 private:
   laddr_t laddr = L_ADDR_NULL;
   LBAPinRef pin;
diff --git a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc
index 1835ce895ddf..b05ea76a3747 100644
--- a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc
+++ b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc
@@ -17,10 +17,7 @@ ceph::bufferlist OnodeBlock::get_delta()
   return bl;
 }
 
-void OnodeBlock::on_initial_write()
-{}
-
-void OnodeBlock::on_delta_write(paddr_t)
+void OnodeBlock::logical_on_delta_write()
 {
   // journal submitted to disk, now update the memory
   apply_pending_changes(true);
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 9f53bef81053..0025d98479de 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
@@ -41,8 +41,7 @@ struct OnodeBlock final : LogicalCachedExtent {
   // before the transaction carrying these mutations is committed to
   // disk
   ceph::bufferlist get_delta() final;
-  void on_initial_write() final;
-  void on_delta_write(paddr_t record_block_offset) final;
+  void logical_on_delta_write() final;
   void apply_delta(const ceph::bufferlist &bl) final;
 
   void sync() {