From 8a668355a191d2ee88a005d67cc18b652e3de5ba Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Sat, 3 Feb 2018 17:08:54 +0100
Subject: [PATCH] common: move subsys-dependant types to a dedicated header.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---
 src/common/config.h       | 12 +-----------
 src/common/subsys_types.h | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 src/common/subsys_types.h

diff --git a/src/common/config.h b/src/common/config.h
index 5fbcd662d1281..4a8475c177cf5 100644
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -23,6 +23,7 @@
 #include "log/SubsystemMap.h"
 #include "common/config_obs.h"
 #include "common/options.h"
+#include "common/subsys_types.h"
 
 class CephContext;
 
@@ -338,15 +339,4 @@ inline std::ostream& operator<<(std::ostream& o, const boost::blank& ) {
 int ceph_resolve_file_search(const std::string& filename_list,
 			     std::string& result);
 
-enum config_subsys_id {
-  ceph_subsys_,   // default
-#define SUBSYS(name, log, gather) \
-  ceph_subsys_##name,
-#define DEFAULT_SUBSYS(log, gather)
-#include "common/subsys.h"
-#undef SUBSYS
-#undef DEFAULT_SUBSYS
-  ceph_subsys_max
-};
-
 #endif
diff --git a/src/common/subsys_types.h b/src/common/subsys_types.h
new file mode 100644
index 0000000000000..a7fffdaab5b22
--- /dev/null
+++ b/src/common/subsys_types.h
@@ -0,0 +1,34 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2018 Red Hat Inc.
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#ifndef CEPH_SUBSYS_TYPES_H
+#define CEPH_SUBSYS_TYPES_H
+
+enum ceph_subsys_id_t {
+  ceph_subsys_,   // default
+#define SUBSYS(name, log, gather) \
+  ceph_subsys_##name,
+#define DEFAULT_SUBSYS(log, gather)
+#include "common/subsys.h"
+#undef SUBSYS
+#undef DEFAULT_SUBSYS
+  ceph_subsys_max
+};
+
+constexpr static std::size_t ceph_subsys_get_num() {
+  return static_cast<std::size_t>(ceph_subsys_max);
+}
+
+#endif // CEPH_SUBSYS_TYPES_H
+
-- 
2.39.5