diff options
| author | Greg Farnum <greg@inktank.com> | 2013-09-24 13:02:29 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-09-30 14:49:37 -0700 |
| commit | 7bf8cb7d9fa0df8440346237978197281b0ba4b5 (patch) | |
| tree | 61c874092ccd71a6e23187f5f157a2bc10964b3d | |
| parent | 7f3165b52c7d33eb4417bed5d0f64a5be91f8d36 (diff) | |
| download | ceph-7bf8cb7d9fa0df8440346237978197281b0ba4b5.tar.gz | |
ReplicatedPG: remove useless pcop param from start_copy
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 5 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 88dc150448b..41ca7e289e5 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3764,7 +3764,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops) result = -EINVAL; break; } - result = start_copy(ctx, src, src_oloc, src_version, &ctx->copy_op); + result = start_copy(ctx, src, src_oloc, src_version); if (result < 0) goto fail; result = -EINPROGRESS; @@ -4377,8 +4377,7 @@ struct C_Copyfrom : public Context { }; int ReplicatedPG::start_copy(OpContext *ctx, - hobject_t src, object_locator_t oloc, version_t version, - CopyOpRef *pcop) + hobject_t src, object_locator_t oloc, version_t version) { const hobject_t& dest = ctx->obs->oi.soid; dout(10) << __func__ << " " << dest << " ctx " << ctx diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index e24592e932f..c10cc0c9b45 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -724,8 +724,7 @@ protected: // -- copyfrom -- map<hobject_t, CopyOpRef> copy_ops; - int start_copy(OpContext *ctx, hobject_t src, object_locator_t oloc, version_t version, - CopyOpRef *pcop); + int start_copy(OpContext *ctx, hobject_t src, object_locator_t oloc, version_t version); void process_copy_chunk(hobject_t oid, tid_t tid, int r); void _write_copy_chunk(CopyOpRef cop, ObjectStore::Transaction *t); void _copy_some(OpContext *ctx, CopyOpRef cop); |