]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use 4137/head
authorJianpeng Ma <jianpeng.ma@intel.com>
Mon, 23 Mar 2015 07:12:23 +0000 (15:12 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Mon, 23 Mar 2015 07:12:23 +0000 (15:12 +0800)
op.assert_ver rather than op.watch.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osd/ReplicatedPG.cc

index a01c57c6b8959f06e7ced78bec2ea583c7c089eb..af86f99b58841f0e7a0f232ea29cc7a708d98d6c 100644 (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;