Merge pull request #4137 from majianpeng/assert-version

osd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-03-23 09:21:43 -07:00
commit ca17738475

View File

@ -4106,7 +4106,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
case CEPH_OSD_OP_ASSERT_VER:
++ctx->num_read;
{
uint64_t ver = op.watch.ver;
uint64_t ver = op.assert_ver.ver;
tracepoint(osd, do_osd_op_pre_assert_ver, soid.oid.name.c_str(), soid.snap.val, ver);
if (!ver)
result = -EINVAL;