From 035c5f6a7b03301dd11471b4632e06c85c01513d Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 7 May 2009 15:33:33 -0700 Subject: [PATCH] c3: rados merges issues --- src/osd/ReplicatedPG.cc | 2 +- src/osdc/Objecter.h | 5 +++-- src/s3/c3.cc | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 107064930cf6c..138ee8425b27c 100644 --- 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 ac078c851c1f0..0162110c41ec1 100644 --- 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 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 248dffde67b2c..01c1f391f6bbd 100644 --- 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; -- 2.39.5