{
dout(10) << __func__ << " " << obc << " " << cop << dendl;
ObjectOperation op;
- if (cop->version) {
- op.assert_version(cop->version);
+ if (cop->user_version) {
+ op.assert_version(cop->user_version);
} else {
// we should learn the version after the first chunk, if we didn't know
// it already!
new C_OnFinisher(fin,
&osd->objecter_finisher),
// discover the object version if we don't know it yet
- cop->version ? NULL : &cop->version);
+ cop->user_version ? NULL : &cop->user_version);
fin->tid = tid;
cop->objecter_tid = tid;
osd->objecter_lock.Unlock();
void ReplicatedPG::cancel_copy(CopyOpRef cop, bool requeue)
{
dout(10) << __func__ << " " << cop->obc->obs.oi.soid
- << " from " << cop->src << " " << cop->oloc << " v" << cop->version
+ << " from " << cop->src << " " << cop->oloc << " v" << cop->user_version
<< dendl;
// cancel objecter op, if we can
ObjectContextRef obc;
hobject_t src;
object_locator_t oloc;
- version_t version;
+ version_t user_version;
tid_t objecter_tid;
CopyOp(CopyCallback *cb_, ObjectContextRef _obc, hobject_t s, object_locator_t l,
version_t v, const hobject_t& dest)
- : cb(cb_), obc(_obc), src(s), oloc(l), version(v),
+ : cb(cb_), obc(_obc), src(s), oloc(l), user_version(v),
objecter_tid(0),
size(0),
rval(-1),