diff options
author | Sage Weil <sage@newdream.net> | 2012-03-30 16:07:53 -0700 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2012-03-30 16:07:53 -0700 |
commit | f27acbc88ed26d41a353457007cdd90f22e45e51 (patch) | |
tree | 4b7399a28d9f5c8a96e04aa166f3be02b70447b6 /src/ceph_osd.cc | |
parent | aa31035e555129e56888320b84f16264f28bd7df (diff) | |
parent | 409b648b00f0797bfd2c0a9dc4fea09396215764 (diff) | |
download | ceph-f27acbc88ed26d41a353457007cdd90f22e45e51.tar.gz |
Merge remote-tracking branch 'gh/wip-log'
Conflicts:
src/common/config_opts.h
Diffstat (limited to 'src/ceph_osd.cc')
-rw-r--r-- | src/ceph_osd.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 12b1dee4812..6dc6c6d39dd 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -45,6 +45,8 @@ using namespace std; #include "perfglue/heap_profiler.h" +#define dout_subsys ceph_subsys_osd + OSD *osd = NULL; void handle_osd_signal(int signum) |