ReplicatedPG: rename finish_copy -> finish_copyfrom

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 35e28c18361b866940899d5a3573481aeaeab7a3..6118a25d510c882b1c64c39382f6f68e72a61f1d 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3776,7 +3776,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
          // finish
          result = ctx->copy_cb->get_result();
          if (result >= 0) { //success!
-           result = finish_copy(ctx);
+           result = finish_copyfrom(ctx);
          }
        }
       }
@@ -4544,7 +4544,7 @@ void ReplicatedPG::_build_finish_copy_transaction(CopyOpRef cop,
   }
 }
 
-int ReplicatedPG::finish_copy(OpContext *ctx)
+int ReplicatedPG::finish_copyfrom(OpContext *ctx)
 {
   ObjectState& obs = ctx->new_obs;
   CopyFromCallback *cb = static_cast<CopyFromCallback*>(ctx->copy_cb);

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index d5ef9b26ca3f1434f9a809cf5e01f60ad84ea8d3..f7e677f7b8470d815ab38dbaf843aea835383e62 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -810,7 +810,7 @@ protected:
   void _copy_some(ObjectContextRef obc, CopyOpRef cop);
   void _build_finish_copy_transaction(CopyOpRef cop,
                                       ObjectStore::Transaction& t);
-  int finish_copy(OpContext *ctx);
+  int finish_copyfrom(OpContext *ctx);
   void cancel_copy(CopyOpRef cop);
   void cancel_copy_ops();