From: Kefu Chai <kchai@redhat.com>
Date: Wed, 22 Feb 2017 18:36:22 +0000 (+0800)
Subject: ceph-dencoder: s/WITH_LIBAIO/HAVE_LIBAIO/
X-Git-Tag: v12.0.1~289^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13595%2Fhead;p=ceph.git

ceph-dencoder: s/WITH_LIBAIO/HAVE_LIBAIO/

* s/WITH_LIBAIO/HAVE_LIBAIO/: as HAVE_LIBAIO is used to detect if libaio
  is installed and is exposed in the acconfig.h.
* do not test bluestore_blob_t with ceph-dencoder, as it repurposes the
  "feature" parameter for struct_v.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 3616f88233e3..a1891e3afdb8 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -116,14 +116,18 @@ TYPE(ObjectStore::Transaction)
 #include "os/filestore/SequencerPosition.h"
 TYPE(SequencerPosition)
 
-#ifdef WITH_LIBAIO
+#ifdef HAVE_LIBAIO
 #include "os/bluestore/bluestore_types.h"
 TYPE(bluestore_cnode_t)
 TYPE(bluestore_compression_header_t)
 TYPE(bluestore_extent_ref_map_t)
 TYPE(bluestore_pextent_t)
-TYPE(bluestore_blob_t)
-TYPE(bluestore_lextent_t)
+// TODO: bluestore_blob_t repurposes the "feature" param of encode() for its
+// struct_v. at a higher level, BlueStore::ExtendMap 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_onode_t)
 TYPE(bluestore_wal_op_t)
 TYPE(bluestore_wal_transaction_t)