From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 5 Dec 2017 14:58:04 +0000 (-0500)
Subject: ceph-dencoder: moved RBD types outside of RGW preprocessor guard
X-Git-Tag: wip-pdonnell-testing-20180317.202121~898^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b00ac12f4045cd39ac9a436cf32d233d16bc3485;p=ceph-ci.git

ceph-dencoder: moved RBD types outside of RGW preprocessor guard

Fixes: http://tracker.ceph.com/issues/22321
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index c061e93bd58..4cfcb15edff 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -405,6 +405,8 @@ TYPE(rgw_data_sync_info)
 TYPE(rgw_data_sync_marker)
 TYPE(rgw_data_sync_status)
 
+#endif
+
 #ifdef WITH_RBD
 #include "cls/rbd/cls_rbd.h"
 TYPE(cls_rbd_parent)
@@ -416,8 +418,6 @@ TYPE(cls::rbd::MirrorImage)
 TYPE(cls::rbd::MirrorImageMap)
 #endif
 
-#endif
-
 #include "cls/lock/cls_lock_types.h"
 TYPE(rados::cls::lock::locker_id_t)
 TYPE_FEATUREFUL(rados::cls::lock::locker_info_t)