diff options
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 211a4c1fe7c..4da249f628b 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -15,45 +15,40 @@ #ifndef CEPH_OSD_H #define CEPH_OSD_H -#include "boost/tuple/tuple.hpp" - -#include "PG.h" - -#include "msg/Dispatcher.h" +#include <boost/tuple/tuple.hpp> +#include <map> +#include <memory> +#include <tr1/memory> +#include <ext/hash_map> +#include <ext/hash_set> +#include "include/CompatSet.h" #include "common/Mutex.h" #include "common/RWLock.h" #include "common/Timer.h" #include "common/WorkQueue.h" #include "common/LogClient.h" #include "common/AsyncReserver.h" - -#include "os/ObjectStore.h" -#include "OSDCap.h" - +#include "common/shared_cache.hpp" +#include "common/simple_cache.hpp" +#include "common/sharedptr_registry.hpp" +#include "common/PrioritizedQueue.h" #include "common/DecayCounter.h" -#include "osd/ClassHandler.h" - -#include "include/CompatSet.h" - #include "auth/KeyRing.h" +#include "msg/Dispatcher.h" +#include "os/ObjectStore.h" +#include "global/global_context.h" + #include "messages/MOSDRepScrub.h" + +#include "OSDCap.h" +#include "ClassHandler.h" #include "OpRequest.h" +#include "PG.h" -#include <map> -#include <memory> -#include <tr1/memory> using namespace std; - -#include <ext/hash_map> -#include <ext/hash_set> using namespace __gnu_cxx; -#include "common/shared_cache.hpp" -#include "common/simple_cache.hpp" -#include "common/sharedptr_registry.hpp" -#include "common/PrioritizedQueue.h" - #define CEPH_OSD_PROTOCOL 10 /* cluster internal */ |