]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-dencoder: moved RBD types outside of RGW preprocessor guard
authorJason Dillaman <dillaman@redhat.com>
Tue, 5 Dec 2017 14:58:04 +0000 (09:58 -0500)
committerJason Dillaman <dillaman@redhat.com>
Tue, 5 Dec 2017 14:58:04 +0000 (09:58 -0500)
Fixes: http://tracker.ceph.com/issues/22321
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/test/encoding/types.h

index c061e93bd58c03b933fc4f8739db48f364912bc5..4cfcb15edff1bf0f0b753241f964186f25f92d97 100644 (file)
@@ -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)