From: Haomai Wang <haomaiwang@gmail.com>
Date: Tue, 10 Dec 2013 07:34:14 +0000 (+0800)
Subject: Move PerfCounter from ObjectStore.h to FileStore.h
X-Git-Tag: v0.75~79^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=015e9819d96b54d6ba58ef193bec84a3c080de2c;p=ceph.git

Move PerfCounter from ObjectStore.h to FileStore.h

The anonymous enum which used by FileStore as PerfCounter is only can be
used by FileStore, so we need to drive out ObjectStore.h

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 4a2af08dd4c..f27723ffc2a 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -18,7 +18,7 @@
 #include "FileJournal.h"
 #include "include/color.h"
 #include "common/perf_counters.h"
-#include "os/ObjectStore.h"
+#include "os/FileStore.h"
 
 #include "include/compat.h"
 
diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index f3fa1cad9a2..a8493666f38 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -64,6 +64,34 @@ static const __SWORD_TYPE XFS_SUPER_MAGIC(0x58465342);
 static const __SWORD_TYPE ZFS_SUPER_MAGIC(0x2fc12fc1);
 #endif
 
+enum {
+  l_os_first = 84000,
+  l_os_jq_max_ops,
+  l_os_jq_ops,
+  l_os_j_ops,
+  l_os_jq_max_bytes,
+  l_os_jq_bytes,
+  l_os_j_bytes,
+  l_os_j_lat,
+  l_os_j_wr,
+  l_os_j_wr_bytes,
+  l_os_oq_max_ops,
+  l_os_oq_ops,
+  l_os_ops,
+  l_os_oq_max_bytes,
+  l_os_oq_bytes,
+  l_os_bytes,
+  l_os_apply_lat,
+  l_os_committing,
+  l_os_commit,
+  l_os_commit_len,
+  l_os_commit_lat,
+  l_os_j_full,
+  l_os_queue_lat,
+  l_os_last,
+};
+
+
 enum fs_types {
   FS_TYPE_NONE = 0,
   FS_TYPE_XFS,
diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 1c43cdb6784..fe535ff7286 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -47,33 +47,6 @@ namespace ceph {
 
 class Logger;
 
-enum {
-  l_os_first = 84000,
-  l_os_jq_max_ops,
-  l_os_jq_ops,
-  l_os_j_ops,
-  l_os_jq_max_bytes,
-  l_os_jq_bytes,
-  l_os_j_bytes,
-  l_os_j_lat,
-  l_os_j_wr,
-  l_os_j_wr_bytes,
-  l_os_oq_max_ops,
-  l_os_oq_ops,
-  l_os_ops,
-  l_os_oq_max_bytes,
-  l_os_oq_bytes,
-  l_os_bytes,
-  l_os_apply_lat,
-  l_os_committing,
-  l_os_commit,
-  l_os_commit_len,
-  l_os_commit_lat,
-  l_os_j_full,
-  l_os_queue_lat,
-  l_os_last,
-};
-
 
 static inline void encode(const map<string,bufferptr> *attrset, bufferlist &bl) {
   ::encode(*attrset, bl);