diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-06 16:57:31 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-06 16:57:31 -0700 |
| commit | 0f6d90c7605a05efa9599bfa43ae547096fe1b50 (patch) | |
| tree | e9f9c51f15c5ba67e14641fe3a9aabb05d844662 /src/mds | |
| parent | a30601a1b69c3f1ac5cfa592050877aec8b5be9d (diff) | |
| download | ceph-0f6d90c7605a05efa9599bfa43ae547096fe1b50.tar.gz | |
make everyone use our assert #include and macro
...as detected by the previous patch.
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/mds')
| -rw-r--r-- | src/mds/CDir.cc | 1 | ||||
| -rw-r--r-- | src/mds/CInode.cc | 9 | ||||
| -rw-r--r-- | src/mds/MDCache.cc | 14 | ||||
| -rw-r--r-- | src/mds/MDLog.cc | 1 | ||||
| -rw-r--r-- | src/mds/MDSTable.cc | 1 | ||||
| -rw-r--r-- | src/mds/SessionMap.cc | 1 | ||||
| -rw-r--r-- | src/mds/SnapServer.cc | 1 |
7 files changed, 17 insertions, 11 deletions
diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index d6e35e55f53..6761c6ffffd 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -34,6 +34,7 @@ #include "osdc/Objecter.h" #include "common/config.h" +#include "include/assert.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 70faeb81597..86c8179f8c1 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -12,6 +12,10 @@ * */ +#include <inttypes.h> +#include <string> +#include <stdio.h> + #include "CInode.h" #include "CDir.h" #include "CDentry.h" @@ -35,12 +39,9 @@ #include "messages/MLock.h" #include "messages/MClientCaps.h" -#include <inttypes.h> -#include <string> -#include <stdio.h> - #include "common/config.h" #include "global/global_context.h" +#include "include/assert.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 143facaf7b1..ca19760b1a7 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -12,7 +12,12 @@ * */ - +#include <errno.h> +#include <fstream> +#include <iostream> +#include <sstream> +#include <string> +#include <map> #include "MDCache.h" #include "MDS.h" @@ -86,17 +91,12 @@ #include "common/Timer.h" -#include <errno.h> -#include <fstream> -#include <iostream> -#include <sstream> -#include <string> -#include <map> using namespace std; extern struct ceph_file_layout g_default_file_layout; #include "common/config.h" +#include "include/assert.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 294ad53961c..cac5615cbff 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -26,6 +26,7 @@ #include "common/config.h" #include "common/errno.h" +#include "include/assert.h" #define dout_subsys ceph_subsys_mds #undef DOUT_COND diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc index 308a9e5d65a..ed08f25ac94 100644 --- a/src/mds/MDSTable.cc +++ b/src/mds/MDSTable.cc @@ -22,6 +22,7 @@ #include "include/types.h" #include "common/config.h" +#include "include/assert.h" #define dout_subsys ceph_subsys_mds diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc index c2d348951ee..af150f1f6b9 100644 --- a/src/mds/SessionMap.cc +++ b/src/mds/SessionMap.cc @@ -18,6 +18,7 @@ #include "osdc/Filer.h" #include "common/config.h" +#include "include/assert.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc index 4ce1f776e3b..d15c6ad9dbf 100644 --- a/src/mds/SnapServer.cc +++ b/src/mds/SnapServer.cc @@ -24,6 +24,7 @@ #include "msg/Messenger.h" #include "common/config.h" +#include "include/assert.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix |