ReplicatedPG: remove useless pcop param from start_copy

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 88dc150448bc9d8ec1b3f4aed3465c0f2907e4e8..41ca7e289e54348002e464439fa622cc35bb4d63 100644 (file)
--- 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 e24592e932f345a639d9095b8bc815338cd78b2b..c10cc0c9b453e050897153f9def6709c27bc3aef 100644 (file)
--- 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);