diff options
| author | Greg Farnum <greg@inktank.com> | 2013-10-09 17:53:35 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-10-17 13:11:45 -0700 |
| commit | 73a2cb01fd22db4d15bdf2ff7f86bde45fd3f752 (patch) | |
| tree | 6632edde4673614d0a52183cebd3fdfac4e0e35c | |
| parent | aff31357190b0371772822e21c7ee7f17b357f9f (diff) | |
| download | ceph-73a2cb01fd22db4d15bdf2ff7f86bde45fd3f752.tar.gz | |
ReplicatedPG: copy: don't return from finish_copyfrom
The return value is meaningless; nothing in this function can fail.
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 9 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c1afa0cab18..575e48bb580 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3681,7 +3681,8 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops) } else { // finish assert(ctx->copy_cb->get_result() >= 0); - result = finish_copyfrom(ctx); + finish_copyfrom(ctx); + result = 0; } } break; @@ -4521,7 +4522,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; @@ -4549,10 +4550,10 @@ 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) { dout(10) << __func__ << " " << cop->obc->obs.oi.soid diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index bdaed9333d4..2810cbf641e 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -915,7 +915,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); void cancel_copy_ops(); |