diff options
author | Sage Weil <sage@newdream.net> | 2010-12-11 08:09:17 -0800 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-12-11 08:09:17 -0800 |
commit | 239b7677e7a9df86d35cbfb25226c3f1a06771c5 (patch) | |
tree | 661a7e07bb20b5e5e2cfab53386bd08123485bac /src/ebofs/nodes.h | |
parent | 46242586eddcc948f71260f8c1ea2e8b1845a9f8 (diff) | |
parent | 027d5bfdca196954937c1b038354ca15b5c699b7 (diff) | |
download | ceph-239b7677e7a9df86d35cbfb25226c3f1a06771c5.tar.gz |
Merge remote branch 'origin/syslog' into unstable
Conflicts:
src/mon/Paxos.cc
src/osd/PG.cc
Diffstat (limited to 'src/ebofs/nodes.h')
-rw-r--r-- | src/ebofs/nodes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ebofs/nodes.h b/src/ebofs/nodes.h index 4f357df8c3f..4a42f777641 100644 --- a/src/ebofs/nodes.h +++ b/src/ebofs/nodes.h @@ -45,7 +45,8 @@ */ #undef debofs -#define debofs(x) do { if (x <= g_conf.debug_ebofs) { *_dout << dbeginl << "ebofs.nodepool." +#define debofs(x) do { if (x <= g_conf.debug_ebofs) { \ + _dout_begin_line(x); *_dout << "ebofs.nodepool." class Node { |