From: Sage Weil <sage@redhat.com>
Date: Tue, 3 May 2016 20:22:24 +0000 (-0400)
Subject: os/bluestore: use pextent_t for releases
X-Git-Tag: v11.0.0~359^2~129
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f23067258f2dce59121b474b09f783cd8db6d95d;p=ceph.git

os/bluestore: use pextent_t for releases

Trying to remove the old extent_t

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index a6ef7c9aab8f..3fc8b1fc4539 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -3664,7 +3664,7 @@ void BlueStore::_txc_release(
   bool shared)
 {
   if (shared) {
-    vector<bluestore_extent_t> release;
+    vector<bluestore_pextent_t> release;
     if (!o->enode)
       o->enode = c->get_enode(o->oid.hobj.get_hash());
     o->enode->ref_map.put(offset, length, &release);
diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc
index 579e4077927b..1f4c5dc784f9 100644
--- a/src/os/bluestore/bluestore_types.cc
+++ b/src/os/bluestore/bluestore_types.cc
@@ -213,8 +213,9 @@ void bluestore_extent_ref_map_t::get(uint64_t offset, uint32_t length)
   _check();
 }
 
-void bluestore_extent_ref_map_t::put(uint64_t offset, uint32_t length,
-			   vector<bluestore_extent_t> *release)
+void bluestore_extent_ref_map_t::put(
+  uint64_t offset, uint32_t length,
+  vector<bluestore_pextent_t> *release)
 {
   map<uint64_t,record_t>::iterator p = ref_map.lower_bound(offset);
   if (p == ref_map.end() || p->first > offset) {
@@ -243,7 +244,7 @@ void bluestore_extent_ref_map_t::put(uint64_t offset, uint32_t length,
 	--p->second.refs;
 	_maybe_merge_left(p);
       } else {
-	release->push_back(bluestore_extent_t(p->first, length));
+	release->push_back(bluestore_pextent_t(p->first, length));
 	ref_map.erase(p);
       }
       return;
@@ -255,7 +256,7 @@ void bluestore_extent_ref_map_t::put(uint64_t offset, uint32_t length,
       _maybe_merge_left(p);
       ++p;
     } else {
-      release->push_back(bluestore_extent_t(p->first, p->second.length));
+      release->push_back(bluestore_pextent_t(p->first, p->second.length));
       ref_map.erase(p++);
     }
   }
diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index 6f7f4b56d291..480be8121e4f 100644
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -158,7 +158,7 @@ struct bluestore_extent_ref_map_t {
 
   void add(uint64_t offset, uint32_t len, unsigned ref=2);
   void get(uint64_t offset, uint32_t len);
-  void put(uint64_t offset, uint32_t len, vector<bluestore_extent_t> *release);
+  void put(uint64_t offset, uint32_t len, vector<bluestore_pextent_t> *release);
 
   bool contains(uint64_t offset, uint32_t len) const;
 
diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
index bfe46d41e70c..abed0b4d0733 100644
--- a/src/test/objectstore/test_bluestore_types.cc
+++ b/src/test/objectstore/test_bluestore_types.cc
@@ -80,7 +80,7 @@ TEST(bluestore_extent_ref_map_t, get)
 TEST(bluestore_extent_ref_map_t, put)
 {
   bluestore_extent_ref_map_t m;
-  vector<bluestore_extent_t> r;
+  vector<bluestore_pextent_t> r;
   m.add(10, 30, 1);
   m.put(10, 30, &r);
   cout << m << " " << r << std::endl;