cleanup: globals from libosd

There are some new globals introduced in libosd lately. This patch
cleans them.

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index e537249e8d668af6ce420b0436de3c72ed59960f..589236cb75f2ee55fbd2926865ebd024a9a25976 100644 (file)
--- 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 e1f8b0cf81e5ebc346ebed9b65843be14ec9c776..89ad7412b0adb95e1dd84e213af227f0bee3c692 100644 (file)
--- 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);