From 4ef069c3f019af4db247602c782ff199c3ae3902 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Thu, 2 Dec 2010 10:54:09 -0800
Subject: [PATCH] logging:Move LogEntry.h into common with LogClient

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
---
 src/Makefile.am                    | 2 +-
 src/common/LogClient.h             | 5 ++---
 src/{include => common}/LogEntry.h | 0
 src/messages/MLog.h                | 2 +-
 src/messages/MLogAck.h             | 2 --
 src/mon/LogMonitor.h               | 2 +-
 src/osd/OSD.h                      | 1 -
 src/tools/ceph.cc                  | 2 +-
 8 files changed, 6 insertions(+), 10 deletions(-)
 rename src/{include => common}/LogEntry.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index ea4dc3e0dda07..d0d650a35cac5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -591,6 +591,7 @@ noinst_HEADERS = \
         common/Timer.h\
         common/tls.h\
 	common/WorkQueue.h\
+	common/LogEntry.h\
 	common/LogClient.h\
         config.h\
         crush/CrushWrapper.h\
@@ -608,7 +609,6 @@ noinst_HEADERS = \
         include/Context.h\
 	include/CompatSet.h\
         include/Distribution.h\
-	include/LogEntry.h\
 	include/Spinlock.h\
 	include/addr_parsing.h\
 	include/assert.h\
diff --git a/src/common/LogClient.h b/src/common/LogClient.h
index 4a0e1f3b87d9d..aad5eb9d1adcb 100644
--- a/src/common/LogClient.h
+++ b/src/common/LogClient.h
@@ -15,10 +15,9 @@
 #ifndef CEPH_LOGCLIENT_H
 #define CEPH_LOGCLIENT_H
 
-#include "msg/Dispatcher.h"
-
+#include "common/LogEntry.h"
 #include "common/Mutex.h"
-#include "include/LogEntry.h"
+#include "msg/Dispatcher.h"
 
 #include <iosfwd>
 #include <sstream>
diff --git a/src/include/LogEntry.h b/src/common/LogEntry.h
similarity index 100%
rename from src/include/LogEntry.h
rename to src/common/LogEntry.h
diff --git a/src/messages/MLog.h b/src/messages/MLog.h
index 2a6fab5c1cdc3..db2cb287af5ac 100644
--- a/src/messages/MLog.h
+++ b/src/messages/MLog.h
@@ -15,7 +15,7 @@
 #ifndef CEPH_MLOG_H
 #define CEPH_MLOG_H
 
-#include "include/LogEntry.h"
+#include "common/LogEntry.h"
 #include "messages/PaxosServiceMessage.h"
 
 class MLog : public PaxosServiceMessage {
diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h
index 1617096230d8a..27b098276a1cb 100644
--- a/src/messages/MLogAck.h
+++ b/src/messages/MLogAck.h
@@ -15,8 +15,6 @@
 #ifndef CEPH_MLOGACK_H
 #define CEPH_MLOGACK_H
 
-#include "include/LogEntry.h"
-
 class MLogAck : public Message {
 public:
   ceph_fsid_t fsid;
diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index 91e0185b132fb..330a50a4e3101 100644
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -23,7 +23,7 @@ using namespace std;
 #include "msg/Messenger.h"
 #include "PaxosService.h"
 
-#include "include/LogEntry.h"
+#include "common/LogEntry.h"
 
 class MMonCommand;
 class MLog;
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 7bcf8fa3468fa..fa6db5c813893 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -30,7 +30,6 @@
 #include "common/DecayCounter.h"
 #include "common/ClassHandler.h"
 
-#include "include/LogEntry.h"
 #include "include/CompatSet.h"
 
 #include "auth/KeyRing.h"
diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index 98d8c9b998f40..25c9e33a5579e 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -78,7 +78,7 @@ Context *resend_event = 0;
 #include "mon/PGMap.h"
 #include "osd/OSDMap.h"
 #include "mds/MDSMap.h"
-#include "include/LogEntry.h"
+#include "common/LogEntry.h"
 #include "include/ClassLibrary.h"
 
 #include "mon/mon_types.h"
-- 
2.39.5