From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Oct 2014 01:14:53 +0000 (-0700)
Subject: osdc/Objecter: fix assert_src_version
X-Git-Tag: v0.91~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e508d055ef03717076466e96547ad1c64d61aae;p=ceph.git

osdc/Objecter: fix assert_src_version

Don't use the add_watch() helper; do it like assert_version
does it.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 9b584205607..64cf6bcb6c0 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -897,8 +897,8 @@ struct ObjectOperation {
     osd_op.op.assert_ver.ver = ver;
   }
   void assert_src_version(const object_t& srcoid, snapid_t srcsnapid, uint64_t ver) {
-    bufferlist bl;
-    add_watch(CEPH_OSD_OP_ASSERT_SRC_VERSION, 0, ver, 0, bl);
+    OSDOp& osd_op = add_op(CEPH_OSD_OP_ASSERT_SRC_VERSION);
+    osd_op.op.assert_ver.ver = ver;
     ops.rbegin()->soid = sobject_t(srcoid, srcsnapid);
   }