diff --git a/src/librados/AioCompletionImpl.h b/src/librados/AioCompletionImpl.h index 63a56db8aa8..48941bb2b49 100644 --- a/src/librados/AioCompletionImpl.h +++ b/src/librados/AioCompletionImpl.h @@ -39,8 +39,7 @@ struct librados::AioCompletionImpl { // for read bool is_read; - bufferlist bl, *pbl; - char *buf; + bufferlist bl; unsigned maxlen; IoCtxImpl *io; @@ -54,7 +53,7 @@ struct librados::AioCompletionImpl { callback_safe(0), callback_complete_arg(0), callback_safe_arg(0), - is_read(false), pbl(0), buf(0), maxlen(0), + is_read(false), maxlen(0), io(NULL), aio_write_seq(0), aio_write_list_item(this) { } int set_complete_callback(void *cb_arg, rados_callback_t cb) { diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc index fa5930ffe7e..f16c1caa8cf 100644 --- a/src/librados/IoCtxImpl.cc +++ b/src/librados/IoCtxImpl.cc @@ -592,7 +592,6 @@ int librados::IoCtxImpl::aio_operate_read(const object_t &oid, c->is_read = true; c->io = this; - c->pbl = pbl; Objecter::Op *objecter_op = objecter->prepare_read_op(oid, oloc, *o, snap_seq, pbl, flags, @@ -635,11 +634,10 @@ int librados::IoCtxImpl::aio_read(const object_t oid, AioCompletionImpl *c, c->is_read = true; c->io = this; - c->pbl = pbl; Mutex::Locker l(*lock); objecter->read(oid, oloc, - off, len, snapid, &c->bl, 0, + off, len, snapid, pbl, 0, onack, &c->objver); return 0; } @@ -655,8 +653,9 @@ int librados::IoCtxImpl::aio_read(const object_t oid, AioCompletionImpl *c, c->is_read = true; c->io = this; - c->buf = buf; c->maxlen = len; + c->bl.clear(); + c->bl.push_back(buffer::create_static(len, buf)); Mutex::Locker l(*lock); objecter->read(oid, oloc, @@ -691,7 +690,6 @@ int librados::IoCtxImpl::aio_sparse_read(const object_t oid, c->is_read = true; c->io = this; - c->pbl = NULL; onack->m_ops.sparse_read(off, len, m, data_bl, NULL); @@ -1233,14 +1231,9 @@ void librados::IoCtxImpl::C_aio_Ack::finish(int r) c->safe = true; c->cond.Signal(); - if (c->buf && c->bl.length() > 0) { - unsigned l = MIN(c->bl.length(), c->maxlen); - c->bl.copy(0, l, c->buf); + if (c->bl.length() > 0) { c->rval = c->bl.length(); } - if (c->pbl) { - *c->pbl = c->bl; - } if (c->callback_complete) { c->io->client->finisher.queue(new C_AioComplete(c));