From 159693de00b782b4cd63d9c4b023216a908f94ee Mon Sep 17 00:00:00 2001 From: "Roald J. van Loon" Date: Fri, 6 Sep 2013 10:11:08 +0200 Subject: [PATCH] cleanup: globals from libosd There are some new globals introduced in libosd lately. This patch cleans them. Signed-off-by: Roald J. van Loon --- src/osd/OSD.h | 2 +- src/osd/ReplicatedPG.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/OSD.h b/src/osd/OSD.h index e537249e8d6..589236cb75f 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -435,7 +435,7 @@ public: bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool force_new); - ObjecterDispatcher(OSDService *o) : Dispatcher(g_ceph_context), osd(o) {} + ObjecterDispatcher(OSDService *o) : Dispatcher(cct), osd(o) {} } objecter_dispatcher; friend class ObjecterDispatcher; diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index e1f8b0cf81e..89ad7412b0a 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4134,7 +4134,7 @@ void ReplicatedPG::_copy_some(OpContext *ctx, CopyOpRef cop) dout(10) << __func__ << " " << ctx << " " << cop << dendl; ObjectOperation op; op.assert_version(cop->version); - op.copy_get(&cop->cursor, g_conf->osd_copyfrom_max_chunk, + op.copy_get(&cop->cursor, cct->_conf->osd_copyfrom_max_chunk, &cop->size, &cop->mtime, &cop->attrs, &cop->data, &cop->omap, &cop->rval);