diff options
| author | Greg Farnum <greg@inktank.com> | 2013-10-01 16:42:55 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-10-01 16:54:11 -0700 |
| commit | df5a744125bfdf7d14fe41df3e3f251d3718f7e1 (patch) | |
| tree | d2f4ca4fd5563177adf3b0c99b105b6a8f436caf | |
| parent | 55301a585e552507c5e70ca2555839c04082abde (diff) | |
| download | ceph-df5a744125bfdf7d14fe41df3e3f251d3718f7e1.tar.gz | |
ReplicatedPG: rename finish_copy -> finish_copyfromwip-start-copy
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 4 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 9b7a435c1ac..3fdb389834b 100644 --- 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 b5ef5a7e0f1..634b481846b 100644 --- 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(); |