RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: globals from libosd

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

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
This commit is contained in:
Roald J. van Loon 2013-09-06 10:11:08 +02:00
parent 8d0a1dbc79
commit 159693de00
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osd/OSD.h
View File

@ -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;

2
src/osd/ReplicatedPG.cc
View File

@ -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);