From: Igor Fedotov <ifedotov@mirantis.com>
Date: Wed, 5 Oct 2016 15:14:10 +0000 (+0000)
Subject: os/bluestore: some cleanup around garbage collector
X-Git-Tag: v11.0.1~3^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af1b41522af869e4945a51d124a5847609703df1;p=ceph.git

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 1e963e3e5237..a057c0617d0a 100644
--- 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 7266dc423fbd..f2311ef33487 100644
--- 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