os/bluestore/bluestore_types: remove flags from lextent_t

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 746038b730578680b538240dd27d0ce8028daf36..20d277622000d1ea674cc649731b5f0f55743b25 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5659,7 +5659,7 @@ void BlueStore::_do_write_small(
       dout(20) << __func__ << "  lexold 0x" << std::hex << offset << std::dec
               << ": " << ep->second << dendl;
       bluestore_lextent_t& lex = o->onode.extent_map[offset] =
-       bluestore_lextent_t(blob, b_off + head_pad, length, 0);
+       bluestore_lextent_t(blob, b_off + head_pad, length);
       b->blob.ref_map.get(lex.offset, lex.length);
       b->blob.mark_used(lex.offset, lex.length);
       txc->statfs_delta.stored() += lex.length;
@@ -5732,7 +5732,7 @@ void BlueStore::_do_write_small(
               << " at " << op->extents << dendl;
       o->onode.punch_hole(offset, length, &wctx->lex_old);
       bluestore_lextent_t& lex = o->onode.extent_map[offset] =
-       bluestore_lextent_t(blob, offset - bstart, length, 0);
+       bluestore_lextent_t(blob, offset - bstart, length);
       b->blob.ref_map.get(lex.offset, lex.length);
       b->blob.mark_used(lex.offset, lex.length);
       txc->statfs_delta.stored() += lex.length;
@@ -5792,7 +5792,7 @@ void BlueStore::_do_write_big(
     b->bc.write(txc->seq, 0, t, wctx->buffered ? 0 : Buffer::FLAG_NOCACHE);
     wctx->write(b, 0, t);
     o->onode.punch_hole(offset, l, &wctx->lex_old);
-    o->onode.extent_map[offset] = bluestore_lextent_t(b->id, 0, l, 0);
+    o->onode.extent_map[offset] = bluestore_lextent_t(b->id, 0, l);
     b->blob.ref_map.get(0, l);
     txc->statfs_delta.stored() += l;
     dout(20) << __func__ << "  lex 0x" << std::hex << offset << std::dec << ": "

diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc
index cc0e1a6bd1dcae5f9531bebda52b17e9bac8ae0e..26469f962ccc488d95a8ff29b17478ef2405be58 100644 (file)
--- a/src/os/bluestore/bluestore_types.cc
+++ b/src/os/bluestore/bluestore_types.cc
@@ -696,34 +696,24 @@ int bluestore_blob_t::verify_csum(uint64_t b_off, const bufferlist& bl,
 
 // bluestore_lextent_t
 
-string bluestore_lextent_t::get_flags_string(unsigned flags)
-{
-  string s;
-  return s;
-}
-
 void bluestore_lextent_t::dump(Formatter *f) const
 {
   f->dump_unsigned("blob", blob);
   f->dump_unsigned("offset", offset);
   f->dump_unsigned("length", length);
-  f->dump_unsigned("flags", flags);
 }
 
 void bluestore_lextent_t::generate_test_instances(list<bluestore_lextent_t*>& ls)
 {
   ls.push_back(new bluestore_lextent_t);
-  ls.push_back(new bluestore_lextent_t(23232, 0, 4096, 0));
-  ls.push_back(new bluestore_lextent_t(23232, 16384, 8192, 7));
+  ls.push_back(new bluestore_lextent_t(23232, 0, 4096));
+  ls.push_back(new bluestore_lextent_t(23232, 16384, 8192));
 }
 
 ostream& operator<<(ostream& out, const bluestore_lextent_t& lb)
 {
-  out  << "0x" << std::hex << lb.offset << "~" << lb.length << std::dec
-       << "->" << lb.blob;
-  if (lb.flags)
-    out << ":" << bluestore_lextent_t::get_flags_string(lb.flags);
-  return out;
+  return out << "0x" << std::hex << lb.offset << "~" << lb.length << std::dec
+            << "->" << lb.blob;
 }
 
 
@@ -866,13 +856,11 @@ void bluestore_onode_t::punch_hole(
          bluestore_lextent_t(
            p->second.blob,
            p->second.offset + front,
-           length,
-           p->second.flags));
+           length));
        extent_map[end] = bluestore_lextent_t(
          p->second.blob,
          p->second.offset + front + length,
-         p->second.length - front - length,
-         p->second.flags);
+         p->second.length - front - length);
        p->second.length = front;
        break;
       } else {
@@ -883,8 +871,7 @@ void bluestore_onode_t::punch_hole(
          bluestore_lextent_t(
            p->second.blob,
            p->second.offset + keep,
-           p->second.length - keep,
-           p->second.flags));
+           p->second.length - keep));
        p->second.length = keep;
        ++p;
        continue;
@@ -902,13 +889,11 @@ void bluestore_onode_t::punch_hole(
       bluestore_lextent_t(
        p->second.blob,
        p->second.offset,
-       p->second.length - keep,
-       p->second.flags));
+       p->second.length - keep));
     extent_map[end] = bluestore_lextent_t(
       p->second.blob,
       p->second.offset + p->second.length - keep,
-      keep,
-      p->second.flags);
+      keep);
     extent_map.erase(p++);
     break;
   }

diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index db6f8661676f25e8c6fd36002ddca0ada4a54781..a4335e2269d37123228e44bd78a59531a502ed8d 100644 (file)
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -474,21 +474,16 @@ typedef int64_t bluestore_blob_id_t;
 
 /// lextent: logical data block back by the extent
 struct bluestore_lextent_t {
-  static string get_flags_string(unsigned flags);
-
   bluestore_blob_id_t blob;  ///< blob
   uint32_t offset;           ///< relative offset within the blob
   uint32_t length;           ///< length within the blob
-  uint32_t flags;            ///< FLAGS_*
 
   bluestore_lextent_t(bluestore_blob_id_t _blob = 0,
                      uint32_t o = 0,
-                     uint32_t l = 0,
-                     uint32_t f = 0)
+                     uint32_t l = 0)
     : blob(_blob),
       offset(o),
-      length(l),
-      flags(f) {}
+      length(l) {}
 
   uint64_t end() const {
     return offset + length;
@@ -498,27 +493,15 @@ struct bluestore_lextent_t {
     return blob < 0;
   }
 
-  bool has_flag(unsigned f) const {
-    return flags & f;
-  }
-  void set_flag(unsigned f) {
-    flags |= f;
-  }
-  void clear_flag(unsigned f) {
-    flags &= ~f;
-  }
-
   void encode(bufferlist& bl) const {
     ::encode(blob, bl);
     ::encode(offset, bl);
     ::encode(length, bl);
-    ::encode(flags, bl);
   }
   void decode(bufferlist::iterator& p) {
     ::decode(blob, p);
     ::decode(offset, p);
     ::decode(length, p);
-    ::decode(flags, p);
   }
   void dump(Formatter *f) const;
   static void generate_test_instances(list<bluestore_lextent_t*>& o);

diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
index 18935280c4d9fd246a5177a6f372d0dec0258e13..3354d092ae9b91278fbbca0303835164f7b861cd 100644 (file)
--- a/src/test/objectstore/test_bluestore_types.cc
+++ b/src/test/objectstore/test_bluestore_types.cc
@@ -624,7 +624,7 @@ TEST(bluestore_onode_t, find_lextent)
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(0));
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(100));
 
-  on.extent_map[100] = bluestore_lextent_t(1, 0, 100, 0);
+  on.extent_map[100] = bluestore_lextent_t(1, 0, 100);
   map<uint64_t,bluestore_lextent_t>::iterator a = on.extent_map.find(100);
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(0));
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(99));
@@ -633,7 +633,7 @@ TEST(bluestore_onode_t, find_lextent)
   ASSERT_EQ(a, on.find_lextent(199));
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(200));
 
-  on.extent_map[200] = bluestore_lextent_t(2, 0, 100, 0);
+  on.extent_map[200] = bluestore_lextent_t(2, 0, 100);
   map<uint64_t,bluestore_lextent_t>::iterator b = on.extent_map.find(200);
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(0));
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(99));
@@ -644,7 +644,7 @@ TEST(bluestore_onode_t, find_lextent)
   ASSERT_EQ(b, on.find_lextent(299));
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(300));
 
-  on.extent_map[400] = bluestore_lextent_t(4, 0, 100, 0);
+  on.extent_map[400] = bluestore_lextent_t(4, 0, 100);
   map<uint64_t,bluestore_lextent_t>::iterator d = on.extent_map.find(400);
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(0));
   ASSERT_EQ(on.extent_map.end(), on.find_lextent(99));
@@ -666,7 +666,7 @@ TEST(bluestore_onode_t, seek_lextent)
   ASSERT_EQ(on.extent_map.end(), on.seek_lextent(0));
   ASSERT_EQ(on.extent_map.end(), on.seek_lextent(100));
 
-  on.extent_map[100] = bluestore_lextent_t(1, 0, 100, 0);
+  on.extent_map[100] = bluestore_lextent_t(1, 0, 100);
   map<uint64_t,bluestore_lextent_t>::iterator a = on.extent_map.find(100);
   ASSERT_EQ(a, on.seek_lextent(0));
   ASSERT_EQ(a, on.seek_lextent(99));
@@ -675,7 +675,7 @@ TEST(bluestore_onode_t, seek_lextent)
   ASSERT_EQ(a, on.seek_lextent(199));
   ASSERT_EQ(on.extent_map.end(), on.seek_lextent(200));
 
-  on.extent_map[200] = bluestore_lextent_t(2, 0, 100, 0);
+  on.extent_map[200] = bluestore_lextent_t(2, 0, 100);
   map<uint64_t,bluestore_lextent_t>::iterator b = on.extent_map.find(200);
   ASSERT_EQ(a, on.seek_lextent(0));
   ASSERT_EQ(a, on.seek_lextent(99));
@@ -686,7 +686,7 @@ TEST(bluestore_onode_t, seek_lextent)
   ASSERT_EQ(b, on.seek_lextent(299));
   ASSERT_EQ(on.extent_map.end(), on.seek_lextent(300));
 
-  on.extent_map[400] = bluestore_lextent_t(4, 0, 100, 0);
+  on.extent_map[400] = bluestore_lextent_t(4, 0, 100);
   map<uint64_t,bluestore_lextent_t>::iterator d = on.extent_map.find(400);
   ASSERT_EQ(a, on.seek_lextent(0));
   ASSERT_EQ(a, on.seek_lextent(99));
@@ -709,7 +709,7 @@ TEST(bluestore_onode_t, has_any_lextents)
   ASSERT_FALSE(on.has_any_lextents(0, 1000));
   ASSERT_FALSE(on.has_any_lextents(1000, 1000));
 
-  on.extent_map[100] = bluestore_lextent_t(1, 0, 100, 0);
+  on.extent_map[100] = bluestore_lextent_t(1, 0, 100);
   ASSERT_FALSE(on.has_any_lextents(0, 50));
   ASSERT_FALSE(on.has_any_lextents(0, 100));
   ASSERT_FALSE(on.has_any_lextents(50, 50));
@@ -721,7 +721,7 @@ TEST(bluestore_onode_t, has_any_lextents)
   ASSERT_TRUE(on.has_any_lextents(199, 2));
   ASSERT_FALSE(on.has_any_lextents(200, 2));
 
-  on.extent_map[200] = bluestore_lextent_t(2, 0, 100, 0);
+  on.extent_map[200] = bluestore_lextent_t(2, 0, 100);
   ASSERT_TRUE(on.has_any_lextents(199, 1));
   ASSERT_TRUE(on.has_any_lextents(199, 2));
   ASSERT_TRUE(on.has_any_lextents(200, 2));
@@ -729,7 +729,7 @@ TEST(bluestore_onode_t, has_any_lextents)
   ASSERT_TRUE(on.has_any_lextents(299, 1));
   ASSERT_FALSE(on.has_any_lextents(300, 1));
 
-  on.extent_map[400] = bluestore_lextent_t(4, 0, 100, 0);
+  on.extent_map[400] = bluestore_lextent_t(4, 0, 100);
   ASSERT_TRUE(on.has_any_lextents(0, 10000));
   ASSERT_TRUE(on.has_any_lextents(199, 1));
   ASSERT_FALSE(on.has_any_lextents(300, 1));
@@ -746,30 +746,30 @@ TEST(bluestore_onode_t, compress_extent_map)
 {
   bluestore_onode_t on;
   vector<bluestore_lextent_t> r;
-  on.extent_map[0] = bluestore_lextent_t(1, 0, 100, 0);
-  on.extent_map[100] = bluestore_lextent_t(2, 0, 100, 0);
+  on.extent_map[0] = bluestore_lextent_t(1, 0, 100);
+  on.extent_map[100] = bluestore_lextent_t(2, 0, 100);
   ASSERT_EQ(0, on.compress_extent_map());
   ASSERT_EQ(2u, on.extent_map.size());
 
-  on.extent_map[200] = bluestore_lextent_t(2, 100, 100, 0);
-  on.extent_map[300] = bluestore_lextent_t(2, 200, 100, 0);
+  on.extent_map[200] = bluestore_lextent_t(2, 100, 100);
+  on.extent_map[300] = bluestore_lextent_t(2, 200, 100);
   ASSERT_EQ(2, on.compress_extent_map());
   ASSERT_EQ(2u, on.extent_map.size());
 
-  on.extent_map[200] = bluestore_lextent_t(3, 100, 100, 0);
-  on.extent_map[300] = bluestore_lextent_t(2, 200, 100, 0);
+  on.extent_map[200] = bluestore_lextent_t(3, 100, 100);
+  on.extent_map[300] = bluestore_lextent_t(2, 200, 100);
   ASSERT_EQ(0, on.compress_extent_map());
   ASSERT_EQ(4u, on.extent_map.size());
 
-  on.extent_map[400] = bluestore_lextent_t(2, 300, 100, 0);
-  on.extent_map[500] = bluestore_lextent_t(2, 500, 100, 0);
-  on.extent_map[600] = bluestore_lextent_t(2, 600, 100, 0);
+  on.extent_map[400] = bluestore_lextent_t(2, 300, 100);
+  on.extent_map[500] = bluestore_lextent_t(2, 500, 100);
+  on.extent_map[600] = bluestore_lextent_t(2, 600, 100);
   ASSERT_EQ(2, on.compress_extent_map());
   ASSERT_EQ(5u, on.extent_map.size());
 
-  on.extent_map[400] = bluestore_lextent_t(2, 300, 100, 0);
-  on.extent_map[500] = bluestore_lextent_t(2, 400, 100, 0);
-  on.extent_map[700] = bluestore_lextent_t(2, 500, 100, 0);
+  on.extent_map[400] = bluestore_lextent_t(2, 300, 100);
+  on.extent_map[500] = bluestore_lextent_t(2, 400, 100);
+  on.extent_map[700] = bluestore_lextent_t(2, 500, 100);
   ASSERT_EQ(1, on.compress_extent_map());
   ASSERT_EQ(6u, on.extent_map.size());
 }
@@ -778,8 +778,8 @@ TEST(bluestore_onode_t, punch_hole)
 {
   bluestore_onode_t on;
   vector<bluestore_lextent_t> r;
-  on.extent_map[0] = bluestore_lextent_t(1, 0, 100, 0);
-  on.extent_map[100] = bluestore_lextent_t(2, 0, 100, 0);
+  on.extent_map[0] = bluestore_lextent_t(1, 0, 100);
+  on.extent_map[100] = bluestore_lextent_t(2, 0, 100);
 
   on.punch_hole(0, 100, &r);
   ASSERT_EQ(1u, on.extent_map.size());