os/bluestore: some cleanup around garbage collector

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 1e963e3e523748479907ab53f3caec92dbcc6748..a057c0617d0a4f3e6e20bace5e3e96ecc70ee4ad 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1666,7 +1666,7 @@ bool BlueStore::ExtentMap::encode_some(uint32_t offset, uint32_t length,
     }
     pos = p->logical_offset + p->length;
     if (blobid & BLOBID_FLAG_DEPTH) {
-      small_encode_varint_lowz(p->blob_depth, bl);
+      ::encode(p->blob_depth, bl);
     }
     if (include_blob) {
       p->blob->encode(bl);
@@ -1714,7 +1714,7 @@ void BlueStore::ExtentMap::decode_some(bufferlist& bl)
     le->length = prev_len;
 
     if (blobid & BLOBID_FLAG_DEPTH) {
-      small_decode_varint_lowz(le->blob_depth, p);
+      ::decode(le->blob_depth, p);
     } else {
       le->blob_depth = 1;
     }

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 7266dc423fbd8876cd7c3074abebbec7874ad2a5..f2311ef3348784a1444b822175ea010648d454ec 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -518,7 +518,7 @@ public:
     uint32_t logical_offset = 0;      ///< logical offset
     uint32_t blob_offset = 0;         ///< blob offset
     uint32_t length = 0;              ///< length
-    uint8_t  blob_depth;              /// blob overlapping count
+    uint8_t  blob_depth = 0;          /// blob overlapping count
     BlobRef blob;                     ///< the blob with our data
 
     /// ctor for lookup only