From: shawn <cxwshawn@gmail.com>
Date: Mon, 13 Jun 2016 06:03:51 +0000 (-0400)
Subject: cls: optimize version header file dependency
X-Git-Tag: ses5-milestone6~8^2~18^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a85266259ee5f33a4ba5a6a960105ab6bc976f6;p=ceph.git

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 242acbc021a7..c68f8c4e1cea 100644
--- 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 4c463e3e35a2..36726d6cccb6 100644
--- 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 d9e09415d526..df8a11c8c5ac 100644
--- 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 86036bc79d1f..6007e9ade923 100644
--- 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 {