Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cleanup: changed order of #includes, global_context.h, debug.h

- lots of rewriting of #include ordering (see below)
- renamed mdstypes.h to mds_types.h, same as {osd,mon}_types.h
- included global/global_context.h and global/debug.h where used
- fixed lots of duplicate includes

The order of #includes is now;

1. types include (include/types.h, mds/mds_types.h, etc)
2. system includes (like stl, boost, etc)
3. ceph includes (include/..)
4. ceph common (common/..)
5. ceph other (auth/.., os/.., global/.., etc)
6. list of messages/.., if used
7. local includes (headers from same module)
8. own header (<basename>.h)

"using namespace" stuff is always directly below #include, not intermixed with them

(WIP notice: most files have this implemented, but some not yet)

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
  • Loading branch information...
commit 17ae36a5420eb4568f93ba3d9f185dfbc0a42918 1 parent 18001d0
@roaldvanloon roaldvanloon authored
Showing with 1,345 additions and 1,509 deletions.
  1. +1 −1  src/Makefile.am
  2. +3 −1 src/auth/Auth.h
  3. +4 −4 src/auth/AuthAuthorizeHandler.cc
  4. +0 −1  src/auth/AuthAuthorizeHandler.h
  5. +3 −3 src/auth/AuthClientHandler.cc
  6. +2 −4 src/auth/AuthClientHandler.h
  7. +1 −2  src/auth/AuthMethodList.cc
  8. +1 −0  src/auth/AuthMethodList.h
  9. +2 −2 src/auth/AuthServiceHandler.cc
  10. +0 −2  src/auth/AuthServiceHandler.h
  11. +2 −2 src/auth/AuthSessionHandler.cc
  12. +1 −2  src/auth/AuthSessionHandler.h
  13. +6 −4 src/auth/Crypto.cc
  14. +2 −1  src/auth/Crypto.h
  15. +6 −4 src/auth/KeyRing.cc
  16. +2 −4 src/auth/KeyRing.h
  17. +4 −4 src/auth/RotatingKeyRing.cc
  18. +2 −3 src/auth/RotatingKeyRing.h
  19. +1 −1  src/auth/cephx/CephxAuthorizeHandler.cc
  20. +2 −3 src/auth/cephx/CephxClientHandler.cc
  21. +3 −4 src/auth/cephx/CephxKeyServer.cc
  22. +3 −3 src/auth/cephx/CephxKeyServer.h
  23. +3 −4 src/auth/cephx/CephxProtocol.cc
  24. +6 −9 src/auth/cephx/CephxServiceHandler.cc
  25. +5 −4 src/auth/cephx/CephxSessionHandler.cc
  26. +2 −1  src/auth/none/AuthNoneAuthorizeHandler.cc
  27. +2 −1  src/auth/unknown/AuthUnknownAuthorizeHandler.cc
  28. +4 −5 src/ceph_authtool.cc
  29. +3 −3 src/ceph_conf.cc
  30. +11 −14 src/ceph_fuse.cc
  31. +10 −16 src/ceph_mds.cc
  32. +9 −14 src/ceph_mon.cc
  33. +11 −20 src/ceph_osd.cc
  34. +11 −15 src/ceph_syn.cc
  35. +16 −34 src/client/Client.cc
  36. +7 −15 src/client/Client.h
  37. +2 −2 src/client/Dentry.cc
  38. +1 −0  src/client/Dir.h
  39. +2 −1  src/client/Inode.cc
  40. +3 −4 src/client/Inode.h
  41. +7 −4 src/client/MetaRequest.cc
  42. +2 −2 src/client/MetaRequest.h
  43. +2 −2 src/client/MetaSession.cc
  44. +2 −1  src/client/MetaSession.h
  45. +2 −1  src/client/SnapRealm.cc
  46. +1 −1  src/client/SnapRealm.h
  47. +9 −12 src/client/SyntheticClient.cc
  48. +2 −1  src/client/SyntheticClient.h
  49. +5 −12 src/client/Trace.cc
  50. +1 −1  src/client/Trace.h
  51. +5 −4 src/client/fuse_ll.cc
  52. +0 −2  src/client/test_ioctls.c
  53. +5 −8 src/cls/lock/cls_lock.cc
  54. +5 −7 src/cls/lock/cls_lock_client.cc
  55. +1 −3 src/cls/lock/cls_lock_client.h
  56. +2 −2 src/cls/lock/cls_lock_ops.cc
  57. +2 −1  src/cls/lock/cls_lock_ops.h
  58. +2 −1  src/cls/lock/cls_lock_types.cc
  59. +2 −1  src/cls/lock/cls_lock_types.h
  60. +4 −3 src/cls/rbd/cls_rbd.cc
  61. +6 −4 src/cls/rbd/cls_rbd_client.cc
  62. +5 −4 src/cls/rbd/cls_rbd_client.h
  63. +4 −3 src/cls/refcount/cls_refcount_client.cc
  64. +2 −2 src/cls/refcount/cls_refcount_ops.h
  65. +5 −5 src/cls/rgw/cls_rgw.cc
  66. +4 −2 src/cls/rgw/cls_rgw_client.cc
  67. +1 −0  src/cls/rgw/cls_rgw_client.h
  68. +1 −3 src/cls/rgw/cls_rgw_ops.cc
  69. +3 −2 src/cls/rgw/cls_rgw_ops.h
  70. +1 −2  src/cls/rgw/cls_rgw_types.cc
  71. +2 −1  src/cls/rgw/cls_rgw_types.h
  72. +1 −4 src/cls_acl.cc
  73. +1 −5 src/cls_crypto.cc
  74. +3 −3 src/common/BackTrace.cc
  75. +1 −4 src/common/Clock.cc
  76. +2 −2 src/common/Clock.h
  77. +3 −5 src/common/Cond.h
  78. +2 −3 src/common/ConfUtils.cc
  79. +2 −2 src/common/DecayCounter.h
  80. +2 −1  src/common/Finisher.cc
  81. +5 −8 src/common/Formatter.cc
  82. +1 −1  src/common/Formatter.h
  83. +4 −3 src/common/HeartbeatMap.cc
  84. +1 −2  src/common/HeartbeatMap.h
  85. +7 −11 src/common/LogClient.cc
  86. +3 −3 src/common/LogClient.h
  87. +2 −2 src/common/LogEntry.cc
  88. +2 −1  src/common/LogEntry.h
  89. +5 −4 src/common/MemoryModel.cc
  90. +5 −4 src/common/Mutex.cc
  91. +3 −3 src/common/Mutex.h
  92. +11 −15 src/common/OutputDataSocket.cc
  93. +4 −4 src/common/OutputDataSocket.h
  94. +1 −1  src/common/PrebufferedStreambuf.cc
  95. +2 −1  src/common/RWLock.h
  96. +1 −1  src/common/RefCountedObj.cc
  97. +1 −2  src/common/RefCountedObj.h
  98. +1 −0  src/common/TextTable.h
  99. +5 −6 src/common/Thread.cc
  100. +2 −2 src/common/Throttle.cc
  101. +3 −2 src/common/Throttle.h
  102. +8 −11 src/common/Timer.cc
  103. +3 −3 src/common/Timer.h
  104. +3 −3 src/common/WorkQueue.cc
  105. +3 −3 src/common/WorkQueue.h
  106. +11 −13 src/common/admin_socket.cc
  107. +3 −3 src/common/admin_socket.h
  108. +7 −8 src/common/admin_socket_client.cc
  109. +7 −8 src/common/assert.cc
  110. +4 −4 src/common/blkdev.cc
  111. +8 −9 src/common/buffer.cc
  112. +11 −10 src/common/ceph_argparse.cc
  113. +1 −1  src/common/ceph_argparse.h
  114. +4 −5 src/common/ceph_context.cc
  115. +4 −3 src/common/ceph_crypto.cc
  116. +1 −1  src/common/ceph_crypto.h
  117. +3 −11 src/common/ceph_crypto_cms.cc
  118. +3 −2 src/common/code_environment.cc
  119. +3 −5 src/common/common_init.cc
  120. +13 −14 src/common/config.cc
  121. +3 −2 src/common/config.h
  122. +0 −1  src/common/debug.cc
  123. +6 −6 src/common/debug.h
  124. +5 −4 src/common/entity_name.cc
  125. +2 −1  src/common/entity_name.h
  126. +2 −2 src/common/environment.cc
  127. +2 −3 src/common/errno.cc
  128. +2 −2 src/common/escape.c
  129. +4 −4 src/common/fd.cc
  130. +1 −0  src/common/fiemap.cc
  131. +3 −3 src/common/hex.cc
  132. +1 −1  src/common/ipaddr.cc
  133. +7 −4 src/common/lockdep.cc
  134. +2 −2 src/common/mime.c
  135. +3 −6 src/common/obj_bencher.cc
  136. +6 −8 src/common/perf_counters.cc
  137. +5 −5 src/common/perf_counters.h
  138. +2 −2 src/common/pick_address.cc
  139. +2 −2 src/common/pipe.c
  140. +2 −2 src/common/run_cmd.cc
  141. +1 −1  src/common/safe_io.c
  142. +1 −0  src/common/shared_cache.hpp
  143. +1 −0  src/common/sharedptr_registry.hpp
  144. +7 −7 src/common/signal.cc
  145. +1 −0  src/common/simple_cache.hpp
  146. +2 −3 src/common/simple_spin.cc
  147. +1 −1  src/common/snap_types.cc
  148. +2 −2 src/common/utf8.c
  149. +4 −3 src/common/version.cc
  150. +1 −1  src/common/xattr.c
  151. +5 −9 src/crush/CrushCompiler.cc
  152. +3 −3 src/crush/CrushCompiler.h
  153. +1 −3 src/crush/CrushTester.cc
  154. +6 −9 src/crush/CrushWrapper.h
  155. +2 −1  src/crush/builder.c
  156. +1 −0  src/crush/grammar.h
  157. +1 −0  src/crush/hash.c
  158. +7 −0 src/crush/hash.h
  159. +6 −10 src/crushtool.cc
  160. +3 −2 src/dupstore.cc
  161. +0 −3  src/fooclass.cc
  162. +2 −1  src/global/global_context.cc
  163. +2 −2 src/global/global_context.h
  164. +5 −5 src/global/global_init.cc
  165. +5 −6 src/global/pidfile.cc
  166. +7 −6 src/global/signal_handler.cc
  167. +4 −1 src/include/CompatSet.h
  168. +6 −4 src/key_value_store/cls_kvs.cc
  169. +2 −1  src/key_value_store/key_value_structure.h
  170. +6 −12 src/key_value_store/kv_flat_btree_async.cc
  171. +7 −7 src/key_value_store/kv_flat_btree_async.h
  172. +1 −2  src/key_value_store/kvs_arg_types.h
  173. +5 −4 src/libcephfs.cc
  174. +1 −2  src/librados-config.cc
  175. +3 −3 src/librados/AioCompletionImpl.h
  176. +6 −5 src/librados/IoCtxImpl.cc
  177. +3 −2 src/librados/IoCtxImpl.h
  178. +2 −2 src/librados/PoolAsyncCompletionImpl.h
  179. +4 −6 src/librados/RadosClient.cc
  180. +2 −2 src/librados/RadosClient.h
  181. +9 −8 src/librados/librados.cc
  182. +3 −3 src/librbd/AioCompletion.cc
  183. +5 −7 src/librbd/AioCompletion.h
  184. +4 −4 src/librbd/AioRequest.cc
  185. +2 −3 src/librbd/AioRequest.h
  186. +9 −9 src/librbd/ImageCtx.h
  187. +6 −8 src/librbd/LibrbdWriteback.cc
  188. +3 −2 src/librbd/LibrbdWriteback.h
  189. +1 −1  src/librbd/SnapInfo.h
  190. +3 −3 src/librbd/WatchCtx.cc
  191. +1 −1  src/librbd/WatchCtx.h
  192. +8 −8 src/librbd/internal.cc
  193. +2 −2 src/librbd/internal.h
  194. +10 −12 src/librbd/librbd.cc
  195. +3 −2 src/log/Entry.h
  196. +3 −4 src/log/Log.cc
  197. +2 −2 src/log/Log.h
  198. +2 −1  src/log/test.cc
  199. +3 −3 src/mds/Anchor.h
  200. +5 −7 src/mds/AnchorClient.cc
  201. +5 −3 src/mds/AnchorServer.cc
  202. +4 −6 src/mds/CDentry.cc
  203. +4 −7 src/mds/CDentry.h
  204. +10 −16 src/mds/CDir.cc
  205. +6 −6 src/mds/CDir.h
  206. +11 −19 src/mds/CInode.cc
  207. +10 −10 src/mds/CInode.h
  208. +5 −3 src/mds/Dumper.cc
  209. +0 −1  src/mds/Dumper.h
  210. +4 −3 src/mds/InoTable.cc
  211. +2 −1  src/mds/InoTable.h
  212. +14 −21 src/mds/Locker.cc
  213. +3 −2 src/mds/Locker.h
  214. +3 −4 src/mds/LogEvent.cc
  215. +8 −8 src/mds/LogEvent.h
  216. +5 −2 src/mds/LogSegment.h
  217. +15 −15 src/mds/MDBalancer.cc
  218. +4 −3 src/mds/MDBalancer.h
  219. +22 −30 src/mds/MDCache.cc
  220. +1 −0  src/mds/MDCache.h
  221. +10 −11 src/mds/MDLog.cc
  222. +13 −15 src/mds/MDLog.h
  223. +21 −41 src/mds/MDS.cc
  224. +3 −6 src/mds/MDS.h
  225. +1 −3 src/mds/MDSMap.cc
  226. +6 −8 src/mds/MDSMap.h
  227. +8 −10 src/mds/MDSTable.cc
  228. +2 −1  src/mds/MDSTable.h
  229. +8 −10 src/mds/MDSTableClient.cc
  230. +6 −4 src/mds/MDSTableServer.cc
  231. +15 −20 src/mds/Migrator.cc
  232. +1 −2  src/mds/Migrator.h
  233. +3 −4 src/mds/Mutation.cc
  234. +2 −2 src/mds/Mutation.h
  235. +6 −4 src/mds/Resetter.cc
  236. +24 −25 src/mds/Server.cc
  237. +6 −6 src/mds/SessionMap.cc
  238. +6 −9 src/mds/SessionMap.h
  239. +2 −0  src/mds/SimpleLock.h
  240. +8 −8 src/mds/SnapServer.cc
  241. +3 −3 src/mds/flock.cc
  242. +2 −2 src/mds/flock.h
  243. +2 −4 src/mds/journal.cc
  244. +1 −0  src/mds/locks.c
  245. +9 −7 src/mds/{mdstypes.h → mds_types.h}
  246. +6 −4 src/mds/snap.cc
  247. +2 −1  src/mds/snap.h
  248. +1 −1  src/messages/MCacheExpire.h
  249. +3 −3 src/messages/MClientReconnect.h
  250. +3 −3 src/messages/MClientRequest.h
  251. +4 −1 src/messages/MMDSSlaveRequest.h
  252. +1 −0  src/messages/MMonElection.h
  253. +15 −14 src/mon/AuthMonitor.cc
  254. +6 −3 src/mon/AuthMonitor.h
  255. +9 −8 src/mon/Elector.cc
  256. +5 −5 src/mon/Elector.h
  257. +11 −11 src/mon/LogMonitor.cc
  258. +6 −4 src/mon/LogMonitor.h
  259. +12 −13 src/mon/MDSMonitor.cc
  260. +5 −4 src/mon/MDSMonitor.h
  261. +4 −2 src/mon/MonCaps.cc
  262. +11 −15 src/mon/MonClient.cc
  263. +5 −8 src/mon/MonClient.h
  264. +3 −5 src/mon/MonMap.cc
  265. +2 −3 src/mon/MonMap.h
  266. +16 −30 src/mon/Monitor.cc
  267. +10 −15 src/mon/Monitor.h
  268. +16 −15 src/mon/MonitorStore.cc
  269. +4 −4 src/mon/MonitorStore.h
  270. +15 −13 src/mon/MonmapMonitor.cc
  271. +4 −3 src/mon/MonmapMonitor.h
  272. +17 −19 src/mon/OSDMonitor.cc
  273. +9 −7 src/mon/OSDMonitor.h
  274. +3 −5 src/mon/PGMap.cc
  275. +4 −2 src/mon/PGMap.h
  276. +16 −20 src/mon/PGMonitor.cc
  277. +9 −5 src/mon/PGMonitor.h
  278. +10 −6 src/mon/Paxos.cc
  279. +6 −6 src/mon/Paxos.h
  280. +7 −4 src/mon/PaxosService.cc
  281. +4 −2 src/mon/PaxosService.h
  282. +3 −3 src/mon/Session.h
  283. +2 −0  src/mon/mon_types.h
  284. +5 −5 src/monmaptool.cc
  285. +1 −1  src/mount/mount.ceph.c
  286. +0 −1  src/mount/mtab.c
  287. +4 −5 src/msg/Accepter.cc
  288. +2 −1  src/msg/Accepter.h
  289. +5 −5 src/msg/DispatchQueue.cc
  290. +1 −0  src/msg/DispatchQueue.h
  291. +2 −1  src/msg/Dispatcher.h
  292. +8 −6 src/msg/Message.cc
  293. +4 −7 src/msg/Message.h
  294. +8 −9 src/msg/Messenger.h
  295. +5 −6 src/msg/Pipe.cc
  296. +2 −1  src/msg/Pipe.h
  297. +6 −6 src/msg/SimpleMessenger.h
  298. +2 −2 src/msg/msg_types.cc
  299. +2 −1  src/msg/msg_types.h
  300. +2 −3 src/objclass/class_api.cc
Sorry, we could not display the entire diff because too many files (489) changed.
View
2  src/Makefile.am
@@ -1683,7 +1683,7 @@ noinst_HEADERS = \
mds/events/ETableServer.h\
mds/events/EUpdate.h\
mds/mds_table_types.h\
- mds/mdstypes.h\
+ mds/mds_types.h\
mds/snap.h\
messages/MAuth.h\
messages/MAuthReply.h\
View
4 src/auth/Auth.h
@@ -15,12 +15,14 @@
#ifndef CEPH_AUTHTYPES_H
#define CEPH_AUTHTYPES_H
-#include "Crypto.h"
+#include "include/types.h"
#include "msg/msg_types.h"
#include "common/config.h"
#include "common/entity_name.h"
+#include "Crypto.h"
+
class Cond;
struct EntityAuth {
View
8 src/auth/AuthAuthorizeHandler.cc
@@ -13,12 +13,12 @@
*/
#include "common/debug.h"
-#include "Auth.h"
-#include "AuthAuthorizeHandler.h"
+#include "common/Mutex.h"
+
#include "cephx/CephxAuthorizeHandler.h"
#include "none/AuthNoneAuthorizeHandler.h"
-#include "AuthMethodList.h"
-#include "common/Mutex.h"
+
+#include "AuthAuthorizeHandler.h"
#define dout_subsys ceph_subsys_auth
View
1  src/auth/AuthAuthorizeHandler.h
@@ -17,7 +17,6 @@
#include "Auth.h"
#include "AuthMethodList.h"
-#include "include/types.h"
// Different classes of session crypto handling
View
6 src/auth/AuthClientHandler.cc
@@ -15,14 +15,14 @@
#include <errno.h>
-#include "AuthClientHandler.h"
-#include "KeyRing.h"
-
#include "messages/MAuth.h"
#include "messages/MAuthReply.h"
#include "cephx/CephxClientHandler.h"
#include "none/AuthNoneClientHandler.h"
+#include "KeyRing.h"
+
+#include "AuthClientHandler.h"
AuthClientHandler *get_auth_client_handler(CephContext *cct, int proto,
RotatingKeyRing *rkeys)
View
6 src/auth/AuthClientHandler.h
@@ -15,14 +15,12 @@
#ifndef CEPH_AUTHCLIENTHANDLER_H
#define CEPH_AUTHCLIENTHANDLER_H
-
-#include "auth/Auth.h"
-
#include "common/Mutex.h"
#include "common/Cond.h"
-
#include "common/Timer.h"
+#include "Auth.h"
+
class CephContext;
class MAuthReply;
class AuthClientHandler;
View
3  src/auth/AuthMethodList.cc
@@ -12,16 +12,15 @@
*
*/
+#include "include/str_list.h"
#include "common/Mutex.h"
#include "common/config.h"
#include "common/debug.h"
-#include "include/str_list.h"
#include "AuthMethodList.h"
const static int dout_subsys = ceph_subsys_auth;
-
AuthMethodList::AuthMethodList(CephContext *cct, string str)
{
list<string> sup_list;
View
1  src/auth/AuthMethodList.h
@@ -16,6 +16,7 @@
#define CEPH_AUTHMETHODLIST_H
#include "include/inttypes.h"
+
#include <list>
#include <set>
#include <string>
View
4 src/auth/AuthServiceHandler.cc
@@ -12,11 +12,11 @@
*
*/
-#include "AuthServiceHandler.h"
#include "cephx/CephxServiceHandler.h"
#include "none/AuthNoneServiceHandler.h"
#include "AuthMethodList.h"
-#include "common/config.h"
+
+#include "AuthServiceHandler.h"
#define dout_subsys ceph_subsys_auth
View
2  src/auth/AuthServiceHandler.h
@@ -15,8 +15,6 @@
#ifndef CEPH_AUTHSERVICEHANDLER_H
#define CEPH_AUTHSERVICEHANDLER_H
-#include "include/types.h"
-#include "common/config.h"
#include "Auth.h"
class CephContext;
View
4 src/auth/AuthSessionHandler.cc
@@ -13,11 +13,11 @@
*/
#include "common/debug.h"
-#include "AuthSessionHandler.h"
#include "cephx/CephxSessionHandler.h"
#include "none/AuthNoneSessionHandler.h"
#include "unknown/AuthUnknownSessionHandler.h"
-#include "common/config.h"
+
+#include "AuthSessionHandler.h"
#define dout_subsys ceph_subsys_auth
View
3  src/auth/AuthSessionHandler.h
@@ -16,9 +16,8 @@
#ifndef CEPH_AUTHSESSIONHANDLER_H
#define CEPH_AUTHSESSIONHANDLER_H
-#include "include/types.h"
-#include "common/config.h"
#include "msg/Message.h"
+
#include "Auth.h"
#define SESSION_SIGNATURE_FAILURE -1
View
10 src/auth/Crypto.cc
@@ -10,9 +10,11 @@
* Foundation. See file COPYING.
*
*/
+#include "include/types.h"
#include <sstream>
-#include "Crypto.h"
+#include <errno.h>
+
#ifdef USE_CRYPTOPP
# include <cryptopp/modes.h>
# include <cryptopp/aes.h>
@@ -24,6 +26,8 @@
#endif
#include "include/assert.h"
+#include "include/ceph_fs.h"
+#include "include/compat.h"
#include "common/Clock.h"
#include "common/armor.h"
#include "common/ceph_crypto.h"
@@ -31,10 +35,8 @@
#include "common/debug.h"
#include "common/hex.h"
#include "common/safe_io.h"
-#include "include/ceph_fs.h"
-#include "include/compat.h"
-#include <errno.h>
+#include "Crypto.h"
int get_random_bytes(char *buf, int len)
{
View
3  src/auth/Crypto.h
@@ -16,10 +16,11 @@
#define CEPH_AUTH_CRYPTO_H
#include "include/types.h"
-#include "include/utime.h"
#include <string>
+#include "include/utime.h"
+
class CephContext;
class CryptoHandler;
View
10 src/auth/KeyRing.cc
@@ -17,14 +17,16 @@
#include <memory>
#include <sstream>
-#include "auth/AuthMethodList.h"
-#include "auth/Crypto.h"
-#include "auth/KeyRing.h"
+#include "include/str_list.h"
#include "common/ConfUtils.h"
#include "common/config.h"
#include "common/debug.h"
#include "common/errno.h"
-#include "include/str_list.h"
+
+#include "AuthMethodList.h"
+#include "Crypto.h"
+
+#include "KeyRing.h"
#define dout_subsys ceph_subsys_auth
View
6 src/auth/KeyRing.h
@@ -15,10 +15,8 @@
#ifndef CEPH_KEYRING_H
#define CEPH_KEYRING_H
-#include "common/config.h"
-
-#include "auth/Crypto.h"
-#include "auth/Auth.h"
+#include "Crypto.h"
+#include "Auth.h"
class md_config_t;
View
8 src/auth/RotatingKeyRing.cc
@@ -1,13 +1,13 @@
#include <errno.h>
#include <map>
-#include "common/config.h"
-#include "common/debug.h"
#include "include/str_list.h"
+#include "common/debug.h"
#include "Crypto.h"
-#include "auth/RotatingKeyRing.h"
-#include "auth/KeyRing.h"
+#include "KeyRing.h"
+
+#include "RotatingKeyRing.h"
#define dout_subsys ceph_subsys_auth
#undef dout_prefix
View
5 src/auth/RotatingKeyRing.h
@@ -15,11 +15,10 @@
#ifndef CEPH_ROTATINGKEYRING_H
#define CEPH_ROTATINGKEYRING_H
-#include "common/config.h"
#include "common/Mutex.h"
-#include "auth/Crypto.h"
-#include "auth/Auth.h"
+#include "Crypto.h"
+#include "Auth.h"
/*
* mediate access to a service's keyring and rotating secrets
View
2  src/auth/cephx/CephxAuthorizeHandler.cc
@@ -1,7 +1,7 @@
#include "../KeyRing.h"
-
#include "CephxProtocol.h"
+
#include "CephxAuthorizeHandler.h"
#define dout_subsys ceph_subsys_auth
View
5 src/auth/cephx/CephxClientHandler.cc
@@ -15,12 +15,11 @@
#include <errno.h>
-#include "CephxClientHandler.h"
-#include "CephxProtocol.h"
+#include "common/config.h"
#include "../KeyRing.h"
-#include "common/config.h"
+#include "CephxClientHandler.h"
#define dout_subsys ceph_subsys_auth
#undef dout_prefix
View
7 src/auth/cephx/CephxKeyServer.cc
@@ -12,14 +12,13 @@
*
*/
-#include "common/config.h"
+#include <sstream>
-#include "CephxKeyServer.h"
+#include "common/config.h"
#include "common/Timer.h"
-
#include "global/global_context.h"
-#include <sstream>
+#include "CephxKeyServer.h"
#define dout_subsys ceph_subsys_auth
#undef dout_prefix
View
6 src/auth/cephx/CephxKeyServer.h
@@ -16,11 +16,11 @@
#define CEPH_KEYSSERVER_H
#include "common/config.h"
+#include "common/Timer.h"
-#include "auth/KeyRing.h"
-#include "CephxProtocol.h"
+#include "../KeyRing.h"
-#include "common/Timer.h"
+#include "CephxProtocol.h"
class CephContext;
View
7 src/auth/cephx/CephxProtocol.cc
@@ -12,18 +12,17 @@
*
*/
-#include "CephxProtocol.h"
+#include "include/buffer.h"
#include "common/Clock.h"
#include "common/config.h"
#include "common/debug.h"
-#include "include/buffer.h"
+
+#include "CephxProtocol.h"
#define dout_subsys ceph_subsys_auth
#undef dout_prefix
#define dout_prefix *_dout << "cephx: "
-
-
void cephx_calc_client_server_challenge(CephContext *cct, CryptoKey& secret, uint64_t server_challenge,
uint64_t client_challenge, uint64_t *key, std::string &ret)
{
View
15 src/auth/cephx/CephxServiceHandler.cc
@@ -12,19 +12,16 @@
*
*/
-
-#include "CephxServiceHandler.h"
-#include "CephxProtocol.h"
-
-#include "../Auth.h"
-
-#include "mon/Monitor.h"
-
#include <errno.h>
#include <sstream>
-#include "common/config.h"
#include "include/assert.h"
+#include "common/config.h"
+#include "mon/Monitor.h"
+
+#include "CephxProtocol.h"
+
+#include "CephxServiceHandler.h"
#define dout_subsys ceph_subsys_auth
#undef dout_prefix
View
9 src/auth/cephx/CephxSessionHandler.cc
@@ -12,15 +12,16 @@
*
*/
-#include "CephxSessionHandler.h"
-#include "CephxProtocol.h"
-
#include <errno.h>
#include <sstream>
-#include "common/config.h"
#include "include/assert.h"
#include "include/ceph_features.h"
+#include "common/config.h"
+
+#include "CephxProtocol.h"
+
+#include "CephxSessionHandler.h"
#define dout_subsys ceph_subsys_auth
View
3  src/auth/none/AuthNoneAuthorizeHandler.cc
@@ -12,9 +12,10 @@
*
*/
-#include "AuthNoneAuthorizeHandler.h"
#include "common/debug.h"
+#include "AuthNoneAuthorizeHandler.h"
+
#define dout_subsys ceph_subsys_auth
bool AuthNoneAuthorizeHandler::verify_authorizer(CephContext *cct, KeyStore *keys,
View
3  src/auth/unknown/AuthUnknownAuthorizeHandler.cc
@@ -12,9 +12,10 @@
*
*/
-#include "AuthUnknownAuthorizeHandler.h"
#include "common/debug.h"
+#include "AuthUnknownAuthorizeHandler.h"
+
#define dout_subsys ceph_subsys_auth
bool AuthUnknownAuthorizeHandler::verify_authorizer(CephContext *cct, KeyStore *keys,
View
9 src/ceph_authtool.cc
@@ -12,20 +12,19 @@
*
*/
-using namespace std;
+#include <sstream>
#include "common/config.h"
#include "common/strtol.h"
-
#include "common/ConfUtils.h"
#include "common/ceph_argparse.h"
-#include "global/global_context.h"
-#include "global/global_init.h"
#include "auth/Crypto.h"
#include "auth/Auth.h"
#include "auth/KeyRing.h"
+#include "global/global_context.h"
+#include "global/global_init.h"
-#include <sstream>
+using namespace std;
void usage()
{
View
6 src/ceph_conf.cc
@@ -18,13 +18,13 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include "mon/AuthMonitor.h"
+#include "include/str_list.h"
#include "common/ConfUtils.h"
-#include "global/global_init.h"
#include "common/entity_name.h"
#include "common/ceph_argparse.h"
#include "common/config.h"
-#include "include/str_list.h"
+#include "mon/AuthMonitor.h"
+#include "global/global_init.h"
using std::deque;
using std::string;
View
25 src/ceph_fuse.cc
@@ -15,29 +15,26 @@
#include <sys/stat.h>
#include <iostream>
#include <string>
-using namespace std;
+#include <sys/types.h>
+#include <fcntl.h>
+
+#ifndef DARWIN
+#include <envz.h>
+#endif // DARWIN
#include "common/config.h"
#include "common/errno.h"
-
+#include "common/Timer.h"
+#include "common/safe_io.h"
+#include "common/ceph_argparse.h"
#include "client/Client.h"
#include "client/fuse_ll.h"
-
#include "msg/Messenger.h"
-
#include "mon/MonClient.h"
-
-#include "common/Timer.h"
-#include "common/ceph_argparse.h"
#include "global/global_init.h"
-#include "common/safe_io.h"
-
-#ifndef DARWIN
-#include <envz.h>
-#endif // DARWIN
+#include "global/global_context.h"
-#include <sys/types.h>
-#include <fcntl.h>
+using namespace std;
void usage()
{
View
26 src/ceph_mds.cc
@@ -15,36 +15,30 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-
#include <iostream>
#include <string>
-using namespace std;
#include "include/ceph_features.h"
-
+#include "include/assert.h"
+#include "common/Timer.h"
+#include "common/ceph_argparse.h"
+#include "common/pick_address.h"
#include "common/config.h"
#include "common/strtol.h"
-
+#include "auth/KeyRing.h"
#include "mon/MonMap.h"
+#include "mon/MonClient.h"
+#include "msg/Messenger.h"
#include "mds/MDS.h"
#include "mds/Dumper.h"
#include "mds/Resetter.h"
-
-#include "msg/Messenger.h"
-
-#include "common/Timer.h"
-#include "common/ceph_argparse.h"
-#include "common/pick_address.h"
-
#include "global/global_init.h"
+#include "global/global_context.h"
#include "global/signal_handler.h"
+#include "global/debug.h"
#include "global/pidfile.h"
-#include "mon/MonClient.h"
-
-#include "auth/KeyRing.h"
-
-#include "include/assert.h"
+using namespace std;
#define dout_subsys ceph_subsys_mds
View
23 src/ceph_mon.cc
@@ -15,33 +15,28 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-
#include <iostream>
#include <string>
-using namespace std;
-#include "common/config.h"
+#include "include/CompatSet.h"
+#include "include/assert.h"
#include "include/ceph_features.h"
-
+#include "common/config.h"
+#include "common/ceph_argparse.h"
+#include "common/pick_address.h"
+#include "common/Timer.h"
+#include "common/errno.h"
#include "mon/MonMap.h"
#include "mon/Monitor.h"
#include "mon/MonitorStore.h"
#include "mon/MonClient.h"
-
#include "msg/Messenger.h"
-
-#include "include/CompatSet.h"
-
-#include "common/ceph_argparse.h"
-#include "common/pick_address.h"
-#include "common/Timer.h"
-#include "common/errno.h"
-
#include "global/global_init.h"
+#include "global/global_context.h"
#include "global/signal_handler.h"
#include "global/debug.h"
-#include "include/assert.h"
+using namespace std;
#define dout_subsys ceph_subsys_mon
View
31 src/ceph_osd.cc
@@ -16,37 +16,28 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <uuid/uuid.h>
-
#include <iostream>
#include <string>
-using namespace std;
-#include "osd/OSD.h"
-#include "os/FileStore.h"
-#include "mon/MonClient.h"
#include "include/ceph_features.h"
-
+#include "include/color.h"
+#include "include/assert.h"
+#include "common/errno.h"
+#include "common/pick_address.h"
+#include "common/Timer.h"
+#include "common/ceph_argparse.h"
#include "common/config.h"
-
#include "mon/MonMap.h"
-
-
+#include "mon/MonClient.h"
#include "msg/Messenger.h"
-
-#include "common/Timer.h"
-#include "common/ceph_argparse.h"
-
+#include "os/FileStore.h"
+#include "osd/OSD.h"
+#include "perfglue/heap_profiler.h"
#include "global/global_init.h"
#include "global/signal_handler.h"
#include "global/debug.h"
-#include "include/color.h"
-#include "common/errno.h"
-#include "common/pick_address.h"
-
-#include "perfglue/heap_profiler.h"
-
-#include "include/assert.h"
+using namespace std;
#define dout_subsys ceph_subsys_osd
View
26 src/ceph_syn.cc
@@ -15,28 +15,24 @@
#include <sys/stat.h>
#include <iostream>
#include <string>
-using namespace std;
+#include <sys/types.h>
+#include <fcntl.h>
-#include "common/config.h"
+#if !defined(DARWIN) && !defined(__FreeBSD__)
+#include <envz.h>
+#endif // DARWIN || __FreeBSD__
+#include "common/config.h"
+#include "common/Timer.h"
+#include "common/ceph_argparse.h"
+#include "common/pick_address.h"
#include "client/SyntheticClient.h"
-#include "client/Client.h"
-
#include "msg/Messenger.h"
-
#include "mon/MonClient.h"
-
-#include "common/Timer.h"
#include "global/global_init.h"
-#include "common/ceph_argparse.h"
-#include "common/pick_address.h"
-
-#if !defined(DARWIN) && !defined(__FreeBSD__)
-#include <envz.h>
-#endif // DARWIN || __FreeBSD__
+#include "global/global_context.h"
-#include <sys/types.h>
-#include <fcntl.h>
+using namespace std;
extern int syn_filer_flags;
View
50 src/client/Client.cc
@@ -12,9 +12,6 @@
*
*/
-
-
-// unix-ey fs stuff
#include <unistd.h>
#include <sys/types.h>
#include <time.h>
@@ -22,18 +19,24 @@
#include <sys/stat.h>
#include <sys/param.h>
#include <fcntl.h>
-
#include <sys/statvfs.h>
-
#include <iostream>
-using namespace std;
+#include "include/assert.h"
+#include "include/compat.h"
+#include "common/Cond.h"
+#include "common/perf_counters.h"
#include "common/config.h"
-
-// ceph stuff
+#include "common/admin_socket.h"
+#include "common/errno.h"
+#include "mon/MonClient.h"
+#include "mon/MonMap.h"
+#include "mds/MDSMap.h"
+#include "osd/OSDMap.h"
+#include "osdc/Filer.h"
+#include "osdc/WritebackHandler.h"
#include "messages/MMonMap.h"
-
#include "messages/MClientSession.h"
#include "messages/MClientReconnect.h"
#include "messages/MClientRequest.h"
@@ -43,33 +46,9 @@ using namespace std;
#include "messages/MClientCapRelease.h"
#include "messages/MClientLease.h"
#include "messages/MClientSnap.h"
-
#include "messages/MGenericMessage.h"
-
#include "messages/MMDSMap.h"
-#include "mon/MonClient.h"
-
-#include "mds/MDSMap.h"
-#include "osd/OSDMap.h"
-#include "mon/MonMap.h"
-
-#include "osdc/Filer.h"
-#include "osdc/WritebackHandler.h"
-
-#include "common/Cond.h"
-#include "common/Mutex.h"
-#include "common/perf_counters.h"
-#include "common/admin_socket.h"
-#include "common/errno.h"
-
-#define dout_subsys ceph_subsys_client
-
-#include "include/lru.h"
-
-#include "include/compat.h"
-
-#include "Client.h"
#include "Inode.h"
#include "Dentry.h"
#include "Dir.h"
@@ -79,8 +58,11 @@ using namespace std;
#include "MetaRequest.h"
#include "ObjecterWriteback.h"
-#include "include/assert.h"
+#include "Client.h"
+using namespace std;
+
+#define dout_subsys ceph_subsys_client
#undef dout_prefix
#define dout_prefix *_dout << "client." << whoami << " "
View
22 src/client/Client.h
@@ -17,36 +17,28 @@
#define CEPH_CLIENT_H
#include "include/types.h"
+#include "mds/mds_types.h"
-// stl
#include <string>
#include <set>
#include <map>
#include <fstream>
-using std::set;
-using std::map;
-using std::fstream;
-
#include <ext/hash_map>
-using namespace __gnu_cxx;
#include "include/filepath.h"
#include "include/interval_set.h"
#include "include/lru.h"
-
-#include "mds/mdstypes.h"
-
-#include "msg/Message.h"
-#include "msg/Dispatcher.h"
-#include "msg/Messenger.h"
-
#include "common/Mutex.h"
#include "common/Timer.h"
#include "common/Finisher.h"
-
#include "common/compiler_extensions.h"
-
#include "osdc/ObjectCacher.h"
+#include "msg/Messenger.h"
+
+using std::set;
+using std::map;
+using std::fstream;
+using namespace __gnu_cxx;
class MDSMap;
class OSDMap;
View
4 src/client/Dentry.cc
@@ -3,12 +3,12 @@
#include "include/types.h"
#include "include/utime.h"
+#include "common/Formatter.h"
-#include "Dentry.h"
#include "Dir.h"
#include "Inode.h"
-#include "common/Formatter.h"
+#include "Dentry.h"
void Dentry::dump(Formatter *f) const
{
View
1  src/client/Dir.h
@@ -2,6 +2,7 @@
#define CEPH_CLIENT_DIR_H
class Inode;
+class Dentry;
class Dir {
public:
View
3  src/client/Inode.cc
@@ -2,11 +2,12 @@
// vim: ts=8 sw=2 smarttab
#include "MetaSession.h"
-#include "Inode.h"
#include "Dentry.h"
#include "Dir.h"
#include "SnapRealm.h"
+#include "Inode.h"
+
ostream& operator<<(ostream &out, Inode &in)
{
out << in.vino() << "("
View
7 src/client/Inode.h
@@ -5,13 +5,12 @@
#define CEPH_CLIENT_INODE_H
#include "include/types.h"
+#include "mds/mds_types.h" // hrm
+
+#include "include/assert.h"
#include "include/xlist.h"
#include "include/filepath.h"
-
-#include "mds/mdstypes.h" // hrm
-
#include "osdc/ObjectCacher.h"
-#include "include/assert.h"
class MetaSession;
class Dentry;
View
11 src/client/MetaRequest.cc
@@ -2,12 +2,15 @@
// vim: ts=8 sw=2 smarttab
#include "include/types.h"
-#include "client/MetaRequest.h"
-#include "client/Dentry.h"
-#include "client/Inode.h"
-#include "messages/MClientReply.h"
#include "common/Formatter.h"
+#include "messages/MClientReply.h"
+
+#include "Dentry.h"
+#include "Inode.h"
+
+#include "MetaRequest.h"
+
void MetaRequest::dump(Formatter *f) const
{
f->dump_unsigned("tid", tid);
View
4 src/client/MetaRequest.h
@@ -7,10 +7,10 @@
#include "include/types.h"
#include "msg/msg_types.h"
+#include "mds/mds_types.h"
+
#include "include/xlist.h"
#include "include/filepath.h"
-#include "mds/mdstypes.h"
-
#include "common/Mutex.h"
#include "messages/MClientRequest.h"
View
4 src/client/MetaSession.cc
@@ -3,10 +3,10 @@
#include "include/types.h"
-#include "MetaSession.h"
-
#include "common/Formatter.h"
+#include "MetaSession.h"
+
void MetaSession::dump(Formatter *f) const
{
f->dump_int("mds", mds_num);
View
3  src/client/MetaSession.h
@@ -5,8 +5,9 @@
#define CEPH_CLIENT_METASESSION_H
#include "include/types.h"
-#include "include/utime.h"
#include "msg/msg_types.h"
+
+#include "include/utime.h"
#include "include/xlist.h"
#include "messages/MClientCapRelease.h"
View
3  src/client/SnapRealm.cc
@@ -1,9 +1,10 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
-#include "SnapRealm.h"
#include "common/Formatter.h"
+#include "SnapRealm.h"
+
void SnapRealm::dump(Formatter *f) const
{
f->dump_stream("ino") << ino;
View
2  src/client/SnapRealm.h
@@ -5,8 +5,8 @@
#define CEPH_CLIENT_SNAPREALM_H
#include "include/types.h"
-#include "common/snap_types.h"
#include "include/xlist.h"
+#include "common/snap_types.h"
class Inode;
View
21 src/client/SyntheticClient.cc
@@ -14,18 +14,6 @@
#include <iostream>
#include <sstream>
-using namespace std;
-
-
-#include "common/config.h"
-#include "SyntheticClient.h"
-#include "osdc/Objecter.h"
-#include "osdc/Filer.h"
-
-
-#include "include/filepath.h"
-#include "common/perf_counters.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -33,9 +21,18 @@ using namespace std;
#include <math.h>
#include <sys/statvfs.h>
+
#include "include/assert.h"
+#include "common/config.h"
+#include "common/perf_counters.h"
+#include "osdc/Objecter.h"
+#include "osdc/Filer.h"
#include "global/debug.h"
+#include "SyntheticClient.h"
+
+using namespace std;
+
#define dout_subsys ceph_subsys_client
#undef dout_prefix
#define dout_prefix *_dout << "client." << (whoami >= 0 ? whoami:client->get_nodeid()) << " "
View
3  src/client/SyntheticClient.h
@@ -18,9 +18,10 @@
#include <pthread.h>
-#include "Client.h"
#include "include/Distribution.h"
+#include "global/global_context.h"
+#include "Client.h"
#include "Trace.h"
#define SYNCLIENT_MODE_RANDOMWALK 1
View
17 src/client/Trace.cc
@@ -12,27 +12,20 @@
*
*/
-
-
-#include "Trace.h"
-#include "common/debug.h"
-
#include <iostream>
#include <map>
#include <ext/rope>
-using namespace __gnu_cxx;
-
-#include "common/Mutex.h"
-
-#include "common/config.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include "common/Mutex.h"
+#include "common/config.h"
+#include "common/debug.h"
+#include "Trace.h"
-
+using namespace __gnu_cxx;
void Trace::start()
{
View
2  src/client/Trace.h
@@ -17,10 +17,10 @@
#define CEPH_CLIENT_TRACE_H
#include <stdlib.h>
-
#include <list>
#include <string>
#include <fstream>
+
using std::list;
using std::string;
using std::ifstream;
View
9 src/client/fuse_ll.cc
@@ -23,13 +23,14 @@
#include <fcntl.h>
#include <unistd.h>
-// ceph
+#include "include/types.h"
+#include "include/assert.h"
#include "common/errno.h"
#include "common/safe_io.h"
-#include "include/types.h"
-#include "Client.h"
#include "common/config.h"
-#include "include/assert.h"
+#include "global/debug.h"
+
+#include "Client.h"
static Client *client;
View
2  src/client/test_ioctls.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
@@ -6,7 +5,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <limits.h>
-
#include <sys/ioctl.h>
#include <netinet/in.h>
#include <sys/socket.h>
View
13 src/cls/lock/cls_lock.cc
@@ -8,6 +8,8 @@
*
*/
+#include "include/types.h"
+
#include <algorithm>
#include <cstring>
#include <cstdlib>
@@ -17,21 +19,16 @@
#include <sstream>
#include <vector>
-#include "include/types.h"
#include "include/utime.h"
-#include "objclass/objclass.h"
-
#include "common/Clock.h"
-
-#include "cls/lock/cls_lock_types.h"
-#include "cls/lock/cls_lock_ops.h"
-
+#include "objclass/objclass.h"
#include "global/global_context.h"
+#include "cls_lock_types.h"
+#include "cls_lock_ops.h"
using namespace rados::cls::lock;
-
CLS_VER(1,0)
CLS_NAME(lock)
View
12 src/cls/lock/cls_lock_client.cc
@@ -14,19 +14,17 @@
#include "include/types.h"
#include "msg/msg_types.h"
-#include "include/rados/librados.hpp"
-
-using namespace librados;
#include <iostream>
-
#include <errno.h>
#include <stdlib.h>
#include <time.h>
-#include "cls/lock/cls_lock_types.h"
-#include "cls/lock/cls_lock_ops.h"
-#include "cls/lock/cls_lock_client.h"
+#include "cls_lock_ops.h"
+
+#include "cls_lock_client.h"
+
+using namespace librados;
namespace rados {
namespace cls {
View
4 src/cls/lock/cls_lock_client.h
@@ -4,12 +4,10 @@
#ifndef CEPH_CLS_LOCK_CLIENT_H
#define CEPH_CLS_LOCK_CLIENT_H
-
#include "include/types.h"
#include "include/rados/librados.hpp"
-#include "cls/lock/cls_lock_types.h"
-
+#include "cls_lock_types.h"
namespace rados {
namespace cls {
View
4 src/cls/lock/cls_lock_ops.cc
@@ -14,10 +14,10 @@
#include "include/types.h"
#include "msg/msg_types.h"
+
#include "common/Formatter.h"
-#include "cls/lock/cls_lock_types.h"
-#include "cls/lock/cls_lock_ops.h"
+#include "cls_lock_ops.h"
using namespace rados::cls::lock;
View
3  src/cls/lock/cls_lock_ops.h
@@ -3,7 +3,8 @@
#include "include/types.h"
#include "include/utime.h"
-#include "cls/lock/cls_lock_types.h"
+
+#include "cls_lock_types.h"
struct cls_lock_lock_op
{
View
3  src/cls/lock/cls_lock_types.cc
@@ -14,9 +14,10 @@
#include "include/types.h"
#include "msg/msg_types.h"
+
#include "common/Formatter.h"
-#include "cls/lock/cls_lock_types.h"
+#include "cls_lock_types.h"
using namespace rados::cls::lock;
View
3  src/cls/lock/cls_lock_types.h
@@ -1,10 +1,11 @@
#ifndef CEPH_CLS_LOCK_TYPES_H
#define CEPH_CLS_LOCK_TYPES_H
+#include "msg/msg_types.h"
+
#include "include/encoding.h"
#include "include/types.h"
#include "include/utime.h"
-#include "msg/msg_types.h"
/* lock flags */
#define LOCK_FLAG_RENEW 0x1 /* idempotent lock acquire */
View
7 src/cls/rbd/cls_rbd.cc
@@ -26,6 +26,8 @@
* in each one that they take an input and an output bufferlist.
*/
+#include "include/types.h"
+
#include <algorithm>
#include <cstring>
#include <cstdlib>
@@ -35,11 +37,10 @@
#include <sstream>
#include <vector>
-#include "include/types.h"
-#include "objclass/objclass.h"
#include "include/rbd_types.h"
+#include "objclass/objclass.h"
-#include "cls/rbd/cls_rbd.h"
+#include "cls_rbd.h"
/*
View
10 src/cls/rbd/cls_rbd_client.cc
@@ -1,14 +1,16 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
-#include "cls/lock/cls_lock_client.h"
+#include "include/rbd_types.h"
+
+#include <errno.h>
+
#include "include/buffer.h"
#include "include/encoding.h"
-#include "include/rbd_types.h"
-#include "cls_rbd_client.h"
+#include "../lock/cls_lock_client.h"
-#include <errno.h>
+#include "cls_rbd_client.h"
namespace librbd {
namespace cls_client {
View
9 src/cls/rbd/cls_rbd_client.h
@@ -4,15 +4,16 @@
#ifndef CEPH_LIBRBD_CLS_RBD_CLIENT_H
#define CEPH_LIBRBD_CLS_RBD_CLIENT_H
-#include "cls/lock/cls_lock_types.h"
-#include "common/snap_types.h"
+#include <string>
+#include <vector>
+
#include "include/rados.h"
#include "include/rados/librados.hpp"
#include "include/types.h"
#include "librbd/parent_types.h"
+#include "common/snap_types.h"
-#include <string>
-#include <vector>
+#include "../lock/cls_lock_types.h"
namespace librbd {
namespace cls_client {
View
7 src/cls/refcount/cls_refcount_client.cc
@@ -1,11 +1,12 @@
+#include "include/types.h"
+
#include <errno.h>
-#include "include/types.h"
-#include "cls/refcount/cls_refcount_ops.h"
#include "include/rados/librados.hpp"
-using namespace librados;
+#include "cls_refcount_ops.h"
+using namespace librados;
void cls_refcount_get(librados::ObjectWriteOperation& op, const string& tag, bool implicit_ref)
{
View
4 src/cls/refcount/cls_refcount_ops.h
@@ -4,10 +4,10 @@
#ifndef CEPH_CLS_REFCOUNT_OPS_H
#define CEPH_CLS_REFCOUNT_OPS_H
-#include <map>
-
#include "include/types.h"
+#include <map>
+
struct cls_refcount_get_op {
string tag;
bool implicit_ref;
View
10 src/cls/rgw/cls_rgw.cc
@@ -1,20 +1,20 @@
// -*- mode:C; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
-#include <iostream>
+#include "include/types.h"
+#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/rgw/cls_rgw_ops.h"
#include "common/Clock.h"
-
+#include "objclass/objclass.h"
#include "global/global_context.h"
+#include "cls_rgw_ops.h"
+
CLS_VER(1,0)
CLS_NAME(rgw)
View
6 src/cls/rgw/cls_rgw_client.cc
@@ -1,9 +1,11 @@
+#include "include/types.h"
+
#include <errno.h>
-#include "include/types.h"
-#include "cls/rgw/cls_rgw_ops.h"
#include "include/rados/librados.hpp"
+#include "cls_rgw_ops.h"
+
using namespace librados;
void cls_rgw_bucket_init(ObjectWriteOperation& o)
View
1  src/cls/rgw/cls_rgw_client.h
@@ -3,6 +3,7 @@
#include "include/types.h"
#include "include/rados/librados.hpp"
+
#include "cls_rgw_types.h"
/* bucket index */
View
4 src/cls/rgw/cls_rgw_ops.cc
@@ -1,8 +1,6 @@
-
-#include "cls/rgw/cls_rgw_ops.h"
-
#include "common/Formatter.h"
+#include "cls_rgw_ops.h"
void rgw_cls_obj_prepare_op::generate_test_instances(list<rgw_cls_obj_prepare_op*>& o)
{
View
5 src/cls/rgw/cls_rgw_ops.h
@@ -1,10 +1,11 @@
#ifndef CEPH_CLS_RGW_OPS_H
#define CEPH_CLS_RGW_OPS_H
+#include "include/types.h"
+
#include <map>
-#include "include/types.h"
-#include "cls/rgw/cls_rgw_types.h"
+#include "cls_rgw_types.h"
struct rgw_cls_tag_timeout_op
{
View
3  src/cls/rgw/cls_rgw_types.cc
@@ -1,7 +1,6 @@
-
-#include "cls/rgw/cls_rgw_types.h"
#include "common/Formatter.h"
+#include "cls_rgw_types.h"
void rgw_bucket_pending_info::generate_test_instances(list<rgw_bucket_pending_info*>& o)
{
View
3  src/cls/rgw/cls_rgw_types.h
@@ -1,9 +1,10 @@
#ifndef CEPH_CLS_RGW_TYPES_H
#define CEPH_CLS_RGW_TYPES_H
+#include "include/types.h"
+
#include <map>
-#include "include/types.h"
#include "include/utime.h"
#define CEPH_RGW_REMOVE 'r'
View
5 src/cls_acl.cc
@@ -1,18 +1,15 @@
-
+#include "include/types.h"
#include <iostream>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
-
#include <openssl/md5.h>
#include <openssl/sha.h>
-#include "include/types.h"
#include "objclass/objclass.h"
-
CLS_VER(1,0)
CLS_NAME(acl)
View
6 src/cls_crypto.cc
@@ -1,18 +1,14 @@
-
-
+#include "include/types.h"
#include <iostream>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
-
#include <openssl/md5.h>
#include <openssl/sha.h>
-#include "include/types.h"
#include "objclass/objclass.h"
-
CLS_VER(1,0)
CLS_NAME(crypto)
View
6 src/common/BackTrace.cc
@@ -1,13 +1,13 @@
+#include "acconfig.h"
#include <ostream>
#include <cxxabi.h>
#include <stdlib.h>
#include <string.h>
-#include "BackTrace.h"
-
#include "common/version.h"
-#include "acconfig.h"
+
+#include "BackTrace.h"
#define _STR(x) #x
#define STRINGIFY(x) _STR(x)
View
5 src/common/Clock.cc
@@ -12,13 +12,10 @@
*
*/
-
-#include "common/Clock.h"
#include "common/ceph_context.h"
#include "common/config.h"
-#include "include/utime.h"
-#include <time.h>
+#include "Clock.h"
utime_t ceph_clock_now(CephContext *cct)
{