os/bluestore: Write_v2 changes

4) remove Writer::shared_changed and use txc::shared_blobs directly

Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>

diff --git a/src/os/bluestore/Writer.cc b/src/os/bluestore/Writer.cc
index 725f1526213806fa69760e6224b9c37d9c9915d6..41bae8d9cef874cd89194d284c5802faeaf2c86e 100644 (file)
--- a/src/os/bluestore/Writer.cc
+++ b/src/os/bluestore/Writer.cc
@@ -1339,7 +1339,7 @@ void BlueStore::Writer::do_write(
   statfs_delta.stored() += ref_end - location;
   exmp_it after_punch_it =
     bstore->_punch_hole_2(onode->c, onode, location, data_end - location,
-    released, pruned_blobs, shared_changed, statfs_delta);
+    released, pruned_blobs, txc->shared_blobs, statfs_delta);
   dout(25) << "after punch_hole_2: " << std::endl << onode->print(pp_mode) << dendl;
 
   // todo: if we align to disk block before splitting, we could do it in one go
@@ -1376,10 +1376,6 @@ void BlueStore::Writer::do_write(
   _collect_released_allocated();
   // update statfs
   txc->statfs_delta += statfs_delta;
-  // update shared blobs
-  for (auto b: shared_changed) {
-    txc->write_shared_blob(b);
-  }
   dout(25) << "result: " << std::endl << onode->print(pp_mode) << dendl;
 }
 

diff --git a/src/os/bluestore/Writer.h b/src/os/bluestore/Writer.h
index a6f12250012a0089c151a1ead26927a4e9da718d..aa2a41dd186db160eda6b42cf3c91404cfe89a22 100644 (file)
--- a/src/os/bluestore/Writer.h
+++ b/src/os/bluestore/Writer.h
@@ -66,7 +66,6 @@ public:
   write_divertor* test_write_divertor = nullptr;
   read_divertor* test_read_divertor = nullptr;
   std::vector<BlobRef> pruned_blobs;
-  std::set<SharedBlobRef> shared_changed;
   volatile_statfs statfs_delta;
 
 private: