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

Merge pull request #17391 from myoungwon/wip-proxywrite-cleanup

Browse Source 
osd: remove unused variable in do_proxy_write

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Sage Weil 2017-09-01 16:26:50 -05:00 committed by GitHub
commit 30a99d4ca7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osd/PrimaryLogPG.cc
View File

@ -2364,7 +2364,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_manifest_detail(
switch (obc->obs.oi.manifest.type) {
case object_manifest_t::TYPE_REDIRECT:
if (op->may_write() || write_ordered) {
do_proxy_write(op, obc->obs.oi.soid, obc);
do_proxy_write(op, obc);
} else {
do_proxy_read(op, obc);
}
@ -2518,7 +2518,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_cache_detail(
if (op->may_write() || op->may_cache()) {
if (can_proxy_write) {
do_proxy_write(op, missing_oid);
do_proxy_write(op);
} else {
// promote if can't proxy the write
promote_object(obc, missing_oid, oloc, op, promote_obc);
@ -2596,7 +2596,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_cache_detail(
if (!must_promote) {
if (op->may_write() || op->may_cache() || write_ordered) {
if (can_proxy_write) {
do_proxy_write(op, missing_oid);
do_proxy_write(op);
return cache_result_t::HANDLED_PROXY;
}
} else {
@ -2946,7 +2946,7 @@ struct C_ProxyWrite_Commit : public Context {
}
};
void PrimaryLogPG::do_proxy_write(OpRequestRef op, const hobject_t& missing_oid, ObjectContextRef obc)
void PrimaryLogPG::do_proxy_write(OpRequestRef op, ObjectContextRef obc)
{
// NOTE: non-const because ProxyWriteOp takes a mutable ref
MOSDOp *m = static_cast<MOSDOp*>(op->get_nonconst_req());

2
src/osd/PrimaryLogPG.h
View File

@ -1359,7 +1359,7 @@ protected:
// -- proxywrite --
map<ceph_tid_t, ProxyWriteOpRef> proxywrite_ops;
void do_proxy_write(OpRequestRef op, const hobject_t& missing_oid, ObjectContextRef obc = NULL);
void do_proxy_write(OpRequestRef op, ObjectContextRef obc = NULL);
void finish_proxy_write(hobject_t oid, ceph_tid_t tid, int r);
void cancel_proxy_write(ProxyWriteOpRef pwop);