cls: optimize version header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>

diff --git a/src/cls/version/cls_version.cc b/src/cls/version/cls_version.cc
index 242acbc021a77dc619dadb8ad1965fca12d8666b..c68f8c4e1ceaab2e2afd78a96658d216eafbd61d 100644 (file)
--- a/src/cls/version/cls_version.cc
+++ b/src/cls/version/cls_version.cc
@@ -1,20 +1,12 @@
 // -*- mode:C; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <iostream>
-
-#include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 
-#include "include/types.h"
-#include "include/utime.h"
 #include "objclass/objclass.h"
-#include "cls/version/cls_version_types.h"
+
 #include "cls/version/cls_version_ops.h"
-#include "common/Clock.h"
 
-#include "global/global_context.h"
 #include "include/compat.h"
 
 CLS_VER(1,0)

diff --git a/src/cls/version/cls_version_client.cc b/src/cls/version/cls_version_client.cc
index 4c463e3e35a279c0b71ba19168e3737af01fe2c4..36726d6cccb6089cf2a70babe3be569398d21c75 100644 (file)
--- a/src/cls/version/cls_version_client.cc
+++ b/src/cls/version/cls_version_client.cc
@@ -1,7 +1,6 @@
 #include <errno.h>
 
-#include "include/types.h"
-#include "cls/version/cls_version_ops.h"
+#include "cls/version/cls_version_client.h"
 #include "include/rados/librados.hpp"
 
 

diff --git a/src/cls/version/cls_version_client.h b/src/cls/version/cls_version_client.h
index d9e09415d526fa9e48803546344b49475ff9e53b..df8a11c8c5ac5a344d62b5e5c6b4c16c2f60938c 100644 (file)
--- a/src/cls/version/cls_version_client.h
+++ b/src/cls/version/cls_version_client.h
@@ -1,8 +1,14 @@
 #ifndef CEPH_CLS_VERSION_CLIENT_H
 #define CEPH_CLS_VERSION_CLIENT_H
 
-#include "include/types.h"
-#include "include/rados/librados.hpp"
+#include "cls_version_ops.h"
+
+namespace librados {
+        class ObjectWriteOperation;
+        class ObjectReadOperation;
+        class ObjectOperation;
+        class IoCtx;
+}
 
 /*
  * version objclass

diff --git a/src/cls/version/cls_version_ops.h b/src/cls/version/cls_version_ops.h
index 86036bc79d1f80524afdd6d339879742a96c45cb..6007e9ade923a8bf0306a9f27e3a937c5d27c2c7 100644 (file)
--- a/src/cls/version/cls_version_ops.h
+++ b/src/cls/version/cls_version_ops.h
@@ -4,9 +4,6 @@
 #ifndef CEPH_CLS_VERSION_OPS_H
 #define CEPH_CLS_VERSION_OPS_H
 
-#include <map>
-
-#include "include/types.h"
 #include "cls_version_types.h"
 
 struct cls_version_set_op {