fix cls_rbd reorg

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index bcc7181dfb92fb83b99cc043d998b95d64f3489a..47d8f132580ab123ace68cde46a11baca90698a5 100644 (file)
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -39,7 +39,7 @@
 #include "objclass/objclass.h"
 #include "include/rbd_types.h"
 
-#include "librbd/cls_rbd.h"
+#include "cls/rbd/cls_rbd.h"
 
 
 /*

diff --git a/src/librbd/ImageCtx.h b/src/librbd/ImageCtx.h
index 87d2c26bbe4f8140812aa1a0e3914029ec618ef9..14eb6d6d9edbfb8f13e265a1ab0d76e8fa579d5b 100644 (file)
--- a/src/librbd/ImageCtx.h
+++ b/src/librbd/ImageCtx.h
@@ -18,7 +18,7 @@
 #include "include/types.h"
 #include "osdc/ObjectCacher.h"
 
-#include "librbd/cls_rbd_client.h"
+#include "cls/rbd/cls_rbd_client.h"
 #include "librbd/LibrbdWriteback.h"
 #include "librbd/SnapInfo.h"
 #include "librbd/parent_types.h"

diff --git a/src/librbd/SnapInfo.h b/src/librbd/SnapInfo.h
index ef648de45ef944f73655e9c624516e348efd9159..5a7852c3c668642c623242aa1713533bdeb64216 100644 (file)
--- a/src/librbd/SnapInfo.h
+++ b/src/librbd/SnapInfo.h
@@ -7,7 +7,7 @@
 
 #include "include/rados/librados.hpp"
 
-#include "librbd/cls_rbd_client.h"
+#include "cls/rbd/cls_rbd_client.h"
 #include "librbd/parent_types.h"
 
 namespace librbd {

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index c7b40081c3ed639c4e031f0c847ea2c71decc820..51932f7df08b9d3ec6f95f0bbad6870b78a1d582 100644 (file)
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -10,9 +10,10 @@
 #include "include/inttypes.h"
 #include "include/stringify.h"
 
+#include "cls/rbd/cls_rbd.h"
+
 #include "librbd/AioCompletion.h"
 #include "librbd/AioRequest.h"
-#include "librbd/cls_rbd.h"
 #include "librbd/ImageCtx.h"
 
 #include "librbd/internal.h"

diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc
index 5033ad973428ac19e38261769cb0b61707dc772f..e81945524047fc37eea6f3ea3dd5c937a907bfb1 100644 (file)
--- a/src/librbd/librbd.cc
+++ b/src/librbd/librbd.cc
@@ -25,7 +25,7 @@
 #include "osdc/ObjectCacher.h"
 
 #include "librbd/AioCompletion.h"
-#include "librbd/cls_rbd_client.h"
+#include "cls/rbd/cls_rbd_client.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/internal.h"
 #include "librbd/LibrbdWriteback.h"

diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index a0ded60ae02e762f7906ca954dce78e177a378ae..dffa00b754300165a63cb04739ce0078a2a06f85 100644 (file)
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -6,8 +6,8 @@
 #include "include/rados.h"
 #include "include/rados/librados.h"
 #include "include/types.h"
-#include "librbd/cls_rbd.h"
-#include "librbd/cls_rbd_client.h"
+#include "cls/rbd/cls_rbd.h"
+#include "cls/rbd/cls_rbd_client.h"
 
 #include "gtest/gtest.h"
 #include "test/rados-api/test.h"

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 9993aa3b550257e2c14f7b39c87693a01273e57c..2c717cb93377eefdd66d002d6de23461e51f240d 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -135,7 +135,7 @@ TYPE(rgw_obj)
 TYPE(rgw_log_entry)
 TYPE(rgw_intent_log_entry)
 
-#include "librbd/cls_rbd.h"
+#include "cls/rbd/cls_rbd.h"
 TYPE(cls_rbd_parent)
 TYPE(cls_rbd_snap)