From: Erwan Velu <erwan@redhat.com>
Date: Mon, 11 Jun 2018 14:04:08 +0000 (+0200)
Subject: test/encoding/types.h: Adjusting src/os entries
X-Git-Tag: v14.0.1~1127^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0bfbee55c1c31361c59186c79a92eab0e7696246;p=ceph.git

test/encoding/types.h: Adjusting src/os entries

This patch is about:
- Adding the missing headers from src/os
- Adding the missing types from the existing headers
- Ordering types to get them in the file's order (that's easier to update)

Signed-off-by: Erwan Velu <erwan@redhat.com>
---

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 34c0faa0ac8b3..c7c2ca6a67eaa 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -135,19 +135,23 @@ TYPE(SequencerPosition)
 
 #ifdef WITH_BLUESTORE
 #include "os/bluestore/bluestore_types.h"
+TYPE(bluestore_bdev_label_t)
 TYPE(bluestore_cnode_t)
 TYPE(bluestore_compression_header_t)
 TYPE(bluestore_extent_ref_map_t)
 TYPE(bluestore_pextent_t)
+TYPE(bluestore_blob_use_tracker_t)
 // TODO: bluestore_blob_t repurposes the "feature" param of encode() for its
 // struct_v. at a higher level, BlueStore::ExtentMap encodes the extends using
 // a different interface than the normal ones. see
 // BlueStore::ExtentMap::encode_some(). maybe we can test it using another
 // approach.
 // TYPE_FEATUREFUL(bluestore_blob_t)
+// TYPE(bluestore_shared_blob_t) there is no encode here
 TYPE(bluestore_onode_t)
 TYPE(bluestore_deferred_op_t)
 TYPE(bluestore_deferred_transaction_t)
+// TYPE(bluestore_compression_header_t) there is no encode here
 
 #include "os/bluestore/bluefs_types.h"
 TYPE(bluefs_extent_t)
@@ -191,6 +195,13 @@ TYPE_FEATUREFUL(ServiceMap::Daemon)
 TYPE(DBObjectMap::_Header)
 TYPE(DBObjectMap::State)
 
+#include "os/filestore/FileStore.h"
+TYPE(FSSuperblock)
+
+#include "os/kstore/kstore_types.h"
+TYPE(kstore_cnode_t)
+TYPE(kstore_onode_t)
+
 #include "mds/JournalPointer.h"
 TYPE(JournalPointer)