diff options
author | Roald J. van Loon <roaldvanloon@gmail.com> | 2012-12-24 13:10:57 +0100 |
---|---|---|
committer | Roald van Loon <roaldvanloon@gmail.com> | 2012-12-24 22:26:56 +0000 |
commit | 17ae36a5420eb4568f93ba3d9f185dfbc0a42918 (patch) | |
tree | ae06815a5638dea51b98466d81b6b0c5a46f987d /src/mds/Locker.cc | |
parent | 18001d059656224abbf7d92c1c54befd33ec8d6e (diff) | |
download | ceph-wip-dout.tar.gz |
cleanup: changed order of #includes, global_context.h, debug.hwip-dout
- 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>
Diffstat (limited to 'src/mds/Locker.cc')
-rw-r--r-- | src/mds/Locker.cc | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 9cdf0823a77..9133cc834b9 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -12,50 +12,43 @@ * */ +#include "include/types.h" -#include "MDS.h" -#include "MDCache.h" -#include "Locker.h" -#include "CInode.h" -#include "CDir.h" -#include "CDentry.h" -#include "Mutation.h" - -#include "MDLog.h" -#include "MDSMap.h" +#include <errno.h> #include "include/filepath.h" +#include "common/config.h" +#include "msg/Messenger.h" +#include "global/global_context.h" +#include "global/debug.h" #include "events/EString.h" #include "events/EUpdate.h" #include "events/EOpen.h" -#include "msg/Messenger.h" - #include "messages/MGenericMessage.h" #include "messages/MDiscover.h" #include "messages/MDiscoverReply.h" - #include "messages/MDirUpdate.h" - #include "messages/MInodeFileCaps.h" - #include "messages/MLock.h" #include "messages/MClientLease.h" #include "messages/MDentryUnlink.h" - #include "messages/MClientRequest.h" #include "messages/MClientReply.h" #include "messages/MClientCaps.h" #include "messages/MClientCapRelease.h" - #include "messages/MMDSSlaveRequest.h" -#include <errno.h> - -#include "common/config.h" -#include "global/debug.h" +#include "MDS.h" +#include "MDCache.h" +#include "CInode.h" +#include "CDir.h" +#include "CDentry.h" +#include "Mutation.h" +#include "MDLog.h" +#include "Locker.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix |