From: Sage Weil <sage@inktank.com>
Date: Sun, 4 Nov 2012 11:50:09 +0000 (-0800)
Subject: fix cls_rbd reorg
X-Git-Tag: v0.55~130^2~15^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1402b5d943f3dd29232cc147311873a072e8ff7;p=ceph.git

fix cls_rbd reorg
---

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index bcc7181dfb9..47d8f132580 100644
--- 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 87d2c26bbe4..14eb6d6d9ed 100644
--- 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 ef648de45ef..5a7852c3c66 100644
--- 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 c7b40081c3e..51932f7df08 100644
--- 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 5033ad97342..e8194552404 100644
--- 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 a0ded60ae02..dffa00b7543 100644
--- 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 9993aa3b550..2c717cb9337 100644
--- 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)