cls: optimize user header file dependency

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

diff --git a/src/cls/user/cls_user.cc b/src/cls/user/cls_user.cc
index 54152593431c7ff4ec5bfe44edbdd6c10556a667..c616d1ae6563988f89121bc6b922747a46476f02 100644 (file)
--- a/src/cls/user/cls_user.cc
+++ b/src/cls/user/cls_user.cc
@@ -1,17 +1,11 @@
 // -*- 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_user_types.h"
 #include "cls_user_ops.h"
 
 CLS_VER(1,0)

diff --git a/src/cls/user/cls_user_client.cc b/src/cls/user/cls_user_client.cc
index 2625adda3cde9f2226017c89416034f2c6c6778d..c77075dcb24a72c1ceefb5adf936ac6aacf2b6b4 100644 (file)
--- a/src/cls/user/cls_user_client.cc
+++ b/src/cls/user/cls_user_client.cc
@@ -3,8 +3,6 @@
 
 #include <errno.h>
 
-#include "include/types.h"
-#include "cls/user/cls_user_ops.h"
 #include "cls/user/cls_user_client.h"
 #include "include/rados/librados.hpp"
 

diff --git a/src/cls/user/cls_user_client.h b/src/cls/user/cls_user_client.h
index 9465faa7c51bbaedf3f9718eb8e7c06105196f8b..89541092e04d7bdb8051866daa855ad18318872f 100644 (file)
--- a/src/cls/user/cls_user_client.h
+++ b/src/cls/user/cls_user_client.h
@@ -4,11 +4,15 @@
 #ifndef CEPH_CLS_USER_CLIENT_H
 #define CEPH_CLS_USER_CLIENT_H
 
-#include "include/types.h"
-#include "include/rados/librados.hpp"
-#include "cls_user_types.h"
+#include "cls_user_ops.h"
 #include "common/RefCountedObj.h"
 
+namespace librados {
+        class ObjectWriteOperation;
+        class ObjectReadOperation;
+        class IoCtx;
+}
+
 class RGWGetUserHeader_CB : public RefCountedObject {
 public:
   ~RGWGetUserHeader_CB() override {}

diff --git a/src/cls/user/cls_user_ops.cc b/src/cls/user/cls_user_ops.cc
index 68fc841046edfbfc2898ffff610436c8840b104f..65d889bbc5c28093eb90f6da845d3a7303575714 100644 (file)
--- a/src/cls/user/cls_user_ops.cc
+++ b/src/cls/user/cls_user_ops.cc
@@ -1,7 +1,6 @@
 // -*- mode:C; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include "cls/user/cls_user_types.h"
 #include "cls/user/cls_user_ops.h"
 #include "common/Formatter.h"
 #include "common/ceph_json.h"

diff --git a/src/cls/user/cls_user_ops.h b/src/cls/user/cls_user_ops.h
index 0e90b22d13ac72a681dffce81b5bf073f95c86c8..2219a49596200e9e23c3b76a98f6056d133ceaff 100644 (file)
--- a/src/cls/user/cls_user_ops.h
+++ b/src/cls/user/cls_user_ops.h
@@ -4,9 +4,7 @@
 #ifndef CEPH_CLS_USER_OPS_H
 #define CEPH_CLS_USER_OPS_H
 
-#include "include/types.h"
 #include "cls_user_types.h"
-#include "common/ceph_time.h"
 
 struct cls_user_set_buckets_op {
   list<cls_user_bucket_entry> entries;

diff --git a/src/cls/user/cls_user_types.cc b/src/cls/user/cls_user_types.cc
index 34bcd9b5d8219a8e40b8104dc59387816958c429..be3280ca2bd9116bb877d90bb7b041e91b3ce3fb 100644 (file)
--- a/src/cls/user/cls_user_types.cc
+++ b/src/cls/user/cls_user_types.cc
@@ -4,6 +4,7 @@
 #include "cls/user/cls_user_types.h"
 #include "common/Formatter.h"
 #include "common/ceph_json.h"
+#include "include/utime.h"
 
 void cls_user_gen_test_bucket(cls_user_bucket *bucket, int i)
 {