summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-08-26 19:54:37 -0700
committerSamuel Just <sam.just@inktank.com>2013-09-26 11:24:25 -0700
commit087f708ba0a8b4b4c84f94dcdfbab3581fa0400d (patch)
tree862c0cc7cdfa0d360e9899316b6958f842902d28
parent7da308bba0d60b1435cda9698a3320d97050699b (diff)
downloadceph-087f708ba0a8b4b4c84f94dcdfbab3581fa0400d.tar.gz
osd/: allow dout for ReplicatedBackend methods to work in ReplicatedPG.cc
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/ReplicatedPG.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d413847455a..d0984c441d1 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -60,8 +60,9 @@
#define dout_subsys ceph_subsys_osd
#define DOUT_PREFIX_ARGS this, osd->whoami, get_osdmap()
#undef dout_prefix
-#define dout_prefix _prefix(_dout, this, osd->whoami, get_osdmap())
-static ostream& _prefix(std::ostream *_dout, PG *pg, int whoami, OSDMapRef osdmap) {
+#define dout_prefix _prefix(_dout, this)
+template <typename T>
+static ostream& _prefix(std::ostream *_dout, T *pg) {
return *_dout << pg->gen_prefix();
}