c3: rados merges issues

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 107064930cf6c5df34b1d6bd5f418e38ea71ab7d..138ee8425b27c40298888ec2092846414626a46d 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -742,7 +742,7 @@ void ReplicatedPG::op_read(MOSDOp *op)
    case CEPH_OSD_OP_EXEC:
     {
        bufferlist bl;
-       int r = osd->store->read(info.pgid.to_coll(), poid, p->offset, p->length, bl);
+       int r = osd->store->read(info.pgid.to_coll(), soid, p->offset, p->length, bl);
 
        if (data.length() == 0)
          data_off = p->offset;

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index ac078c851c1f053eabafcd6788c3d9293432ce76..0162110c41ec12238e2866158e18e0b1735cb579 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -319,7 +319,8 @@ class Objecter {
   }
 
   tid_t exec(object_t oid, ceph_object_layout ol,
-             __u64 data_off, size_t data_len, bufferlist &bl, int flags,
+             __u64 data_off, size_t data_len,
+             snapid_t snap, bufferlist &bl, int flags,
               bufferlist *pbl, size_t out_len,
               Context *onfinish) {
     vector<ceph_osd_op> ops(1);
@@ -327,7 +328,7 @@ class Objecter {
     ops[0].op = CEPH_OSD_OP_EXEC;
     ops[0].offset = data_off;
     ops[0].length = data_len;
-    ReadOp *rd = new ReadOp(oid, ol, ops, flags, onfinish);
+    ReadOp *rd = new ReadOp(oid, ol, ops, snap, flags, onfinish);
     rd->bl = bl;
     rd->pbl = pbl;
     return read_submit(rd);

diff --git a/src/s3/c3.cc b/src/s3/c3.cc
index 248dffde67b2ceef4fd4e51833570a1f62bfe336..01c1f391f6bbd7aa6614d115f3fec3f9f2fd8bb1 100644 (file)
--- a/src/s3/c3.cc
+++ b/src/s3/c3.cc
@@ -306,7 +306,7 @@ int C3::exec(object_t& oid, const char *code, off_t data_off, size_t data_len, c
   lock.Lock();
 
   objecter->exec(oid, layout,
-             data_off, data_len, bl, 0,
+             data_off, data_len, CEPH_NOSNAP, bl, 0,
              &obl, out_len,
               oncommit);
 
@@ -338,7 +338,7 @@ int C3::read(object_t& oid, char *buf, off_t off, size_t len)
   lock.Lock();
 
   objecter->read(oid, layout,
-             off, len, bl, 0,
+             off, len, CEPH_NOSNAP, bl, 0,
               oncommit);
 
   dout(0) << "after read call" << dendl;