From a08d9619d5e19a39eaf425345a459d0e1f8f64aa Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 4 Dec 2009 10:03:49 -0800
Subject: [PATCH] rados: move librados.h, rados_bencher.h

Also include rados_bencher.h in Makefile.am.
---
 src/Makefile.am                  | 5 +++--
 src/librados.cc                  | 4 +---
 src/{include => osdc}/librados.h | 4 ++--
 src/{ => osdc}/rados_bencher.h   | 2 +-
 src/rados.cc                     | 5 +++--
 src/radosacl.cc                  | 2 +-
 src/rgw/rgw_rados.cc             | 2 +-
 src/rgw/rgw_rados.h              | 2 +-
 src/testrados.c                  | 2 +-
 src/testradospp.cc               | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
 rename src/{include => osdc}/librados.h (99%)
 rename src/{ => osdc}/rados_bencher.h (99%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f3cd824d1f39..77b7c15018f0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -269,7 +269,7 @@ install-data-local:
 	mkdir -p $(DESTDIR)$(includedir)/ceph
 	$(install_sh_SCRIPT) -m 0644 client/libceph.h $(DESTDIR)$(includedir)/ceph/libceph.h
 	mkdir -p $(DESTDIR)$(includedir)/rados
-	$(install_sh_SCRIPT) -m 0644 include/librados.h $(DESTDIR)$(includedir)/rados/librados.h
+	$(install_sh_SCRIPT) -m 0644 osdc/librados.h $(DESTDIR)$(includedir)/rados/librados.h
 	mkdir -p $(DESTDIR)$(includedir)/crush
 	$(install_sh_SCRIPT) -m 0644 crush/hash.h $(DESTDIR)$(includedir)/crush/hash.h
 	$(install_sh_SCRIPT) -m 0644 crush/crush.h $(DESTDIR)$(includedir)/crush/crush.h
@@ -507,7 +507,6 @@ noinst_HEADERS = \
         include/intarith.h\
         include/interval_set.h\
         include/inttypes.h\
-	include/librados.h\
         include/lru.h\
 	include/msgr.h\
         include/nstring.h\
@@ -709,6 +708,8 @@ noinst_HEADERS = \
         osd/RAID4PG.h\
         osd/ReplicatedPG.h\
         osd/osd_types.h\
+	osdc/librados.h\
+	osdc/rados_bencher.h\
         osdc/Blinker.h\
         osdc/Filer.h\
         osdc/Journaler.h\
diff --git a/src/librados.cc b/src/librados.cc
index 4702e4de49d5a..36a3f5e579ae5 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -37,7 +37,7 @@ using namespace std;
 
 #include "osdc/Objecter.h"
 
-#include "include/librados.h"
+#include "osdc/librados.h"
 
 #define RADOS_LIST_MAX_ENTRIES 1024
 #define DOUT_SUBSYS rados
@@ -1343,8 +1343,6 @@ static int rados_initialized = 0;
 
 static RadosClient *radosp;
 
-#include "include/librados.h"
-
 extern "C" int rados_initialize(int argc, const char **argv) 
 {
   int ret = 0;
diff --git a/src/include/librados.h b/src/osdc/librados.h
similarity index 99%
rename from src/include/librados.h
rename to src/osdc/librados.h
index ecce9ec04e98a..ee998c7e9ae8e 100644
--- a/src/include/librados.h
+++ b/src/osdc/librados.h
@@ -13,8 +13,8 @@ extern "C" {
 #include <string.h>
 #include <stdbool.h>
 
-#include "msgr.h"
-#include "rados.h"
+#include "include/msgr.h"
+#include "include/rados.h"
 
 /* initialization */
 int rados_initialize(int argc, const char **argv); /* arguments are optional */
diff --git a/src/rados_bencher.h b/src/osdc/rados_bencher.h
similarity index 99%
rename from src/rados_bencher.h
rename to src/osdc/rados_bencher.h
index c8ee1980a7d39..bc85d8f4446e1 100644
--- a/src/rados_bencher.h
+++ b/src/osdc/rados_bencher.h
@@ -10,7 +10,7 @@
  * Foundation.  See file COPYING.
  * 
  */
-#include "include/librados.h"
+#include "osdc/librados.h"
 #include "config.h"
 #include "common/common_init.h"
 #include "common/Cond.h"
diff --git a/src/rados.cc b/src/rados.cc
index 74ea7368bc7ef..03a3435159b13 100644
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -12,8 +12,9 @@
  * 
  */
 
-#include "rados_bencher.h"
-#include "include/librados.h"
+#include "osdc/rados_bencher.h"
+#include "osdc/librados.h"
+
 #include "config.h"
 #include "common/common_init.h"
 #include "common/Cond.h"
diff --git a/src/radosacl.cc b/src/radosacl.cc
index 199c9ed886b7d..a6c2611f8e304 100644
--- a/src/radosacl.cc
+++ b/src/radosacl.cc
@@ -12,7 +12,7 @@
  * 
  */
 
-#include "include/librados.h"
+#include "osdc/librados.h"
 
 #include <iostream>
 
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 1068c746d1350..f94d2ab06216c 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4,7 +4,7 @@
 #include "rgw_access.h"
 #include "rgw_rados.h"
 
-#include "include/librados.h"
+#include "osdc/librados.h"
 
 #include <string>
 #include <iostream>
diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 1f7e6b593d54f..c8b78b037718d 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -1,7 +1,7 @@
 #ifndef __RGWRADOS_H
 #define __RGWRADOS_H
 
-#include "include/librados.h"
+#include "osdc/librados.h"
 #include "rgw_access.h"
 
 
diff --git a/src/testrados.c b/src/testrados.c
index 6bc58c8f7e46e..9db257e538207 100644
--- a/src/testrados.c
+++ b/src/testrados.c
@@ -12,7 +12,7 @@
  * 
  */
 
-#include "include/librados.h"
+#include "osdc/librados.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/testradospp.cc b/src/testradospp.cc
index ea14741b98d44..b50ec9dca5bda 100644
--- a/src/testradospp.cc
+++ b/src/testradospp.cc
@@ -12,7 +12,7 @@
  * 
  */
 
-#include "include/librados.h"
+#include "osdc/librados.h"
 
 #include <iostream>
 
-- 
2.39.5