diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 5e7745a0bd5..f6399e340a6 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3713,7 +3713,8 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) } else { // finish assert(ctx->copy_cb->get_result() >= 0); - result = finish_copyfrom(ctx); + finish_copyfrom(ctx); + result = 0; } } break; @@ -4544,7 +4545,7 @@ void ReplicatedPG::_build_finish_copy_transaction(CopyOpRef cop, } } -int ReplicatedPG::finish_copyfrom(OpContext *ctx) +void ReplicatedPG::finish_copyfrom(OpContext *ctx) { dout(20) << "finish_copyfrom on " << ctx->obs->oi.soid << dendl; ObjectState& obs = ctx->new_obs; @@ -4572,8 +4573,6 @@ int ReplicatedPG::finish_copyfrom(OpContext *ctx) } ctx->delta_stats.num_wr++; ctx->delta_stats.num_wr_kb += SHIFT_ROUND_UP(obs.oi.size, 10); - - return 0; } void ReplicatedPG::cancel_copy(CopyOpRef cop, bool requeue) diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 57be318331e..7ea1b13f697 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -953,7 +953,7 @@ protected: void _copy_some(ObjectContextRef obc, CopyOpRef cop); void _build_finish_copy_transaction(CopyOpRef cop, ObjectStore::Transaction& t); - int finish_copyfrom(OpContext *ctx); + void finish_copyfrom(OpContext *ctx); void cancel_copy(CopyOpRef cop, bool requeue); void cancel_copy_ops(bool requeue);