]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: src oid is in OSDOp now
authorSage Weil <sage@newdream.net>
Mon, 6 Jun 2011 17:09:30 +0000 (10:09 -0700)
committerSage Weil <sage@newdream.net>
Mon, 6 Jun 2011 17:09:30 +0000 (10:09 -0700)
Signed-off-by: Sage Weil <sage@newdream.net>
src/osd/ReplicatedPG.cc

index c9ea2e9b9ad81a7a273942abdd1cc4686c0b57d6..ffc4386535c9f26ed5a10da2de3fad8d2f9477b6 100644 (file)
@@ -1573,13 +1573,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
     case CEPH_OSD_OP_CLONERANGE:
       {
        bufferlist::iterator p = osd_op.data.begin();
-       object_t src_oid;
-       try {
-         ::decode(src_oid, p);
-       } catch (buffer::error& err) {
-         result = -EINVAL;
-         break;
-       }
+       object_t& src_oid = osd_op.oid;
        ObjectContext *sobc = ctx->src_obc[src_oid];
 
        if (!obs.exists)