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/rbd.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/rbd.cc')
| -rw-r--r-- | src/rbd.cc | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/src/rbd.cc b/src/rbd.cc index bd47ae1cfa1..0b1bb534b8b 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -12,26 +12,7 @@ * */ -#include "mon/MonClient.h" -#include "mon/MonMap.h" -#include "common/config.h" - -#include "auth/KeyRing.h" -#include "common/errno.h" -#include "common/ceph_argparse.h" -#include "global/global_context.h" -#include "global/global_init.h" -#include "common/safe_io.h" -#include "common/secret.h" -#include "include/stringify.h" -#include "include/rados/librados.hpp" -#include "include/rbd/librbd.hpp" -#include "include/byteorder.h" - -#include "include/intarith.h" - -#include "include/compat.h" -#include "common/blkdev.h" +#include "include/rbd_types.h" #include <dirent.h> #include <errno.h> @@ -45,9 +26,6 @@ #include <tr1/memory> #include <sys/ioctl.h> -#include "include/rbd_types.h" -#include "common/TextTable.h" - #if defined(__linux__) #include <linux/fs.h> #endif @@ -56,7 +34,25 @@ #include <sys/param.h> #endif +#include "include/stringify.h" +#include "include/rados/librados.hpp" +#include "include/rbd/librbd.hpp" +#include "include/byteorder.h" +#include "include/intarith.h" +#include "include/compat.h" #include "include/fiemap.h" +#include "common/config.h" +#include "common/errno.h" +#include "common/ceph_argparse.h" +#include "common/safe_io.h" +#include "common/secret.h" +#include "common/blkdev.h" +#include "common/TextTable.h" +#include "auth/KeyRing.h" +#include "mon/MonClient.h" +#include "mon/MonMap.h" +#include "global/global_context.h" +#include "global/global_init.h" #define MAX_SECRET_LEN 1000 #define MAX_POOL_NAME_SIZE 128 |